conflict integ_tests #8

Closed paurea closed 5 years ago