merge conflicts with test results