CONFLICT (content): Merge conflict in test-output/old/Suite/methods-alphabetical.html
Auto-merging test-output/old/Suite/methods.html
CONFLICT (content): Merge conflict in test-output/old/Suite/methods.html
Auto-merging test-output/old/Suite/reporter-output.html
CONFLICT (content): Merge conflict in test-output/old/Suite/reporter-output.html
Auto-merging test-output/old/Suite/testng.xml.html
CONFLICT (content): Merge conflict in test-output/old/Suite/testng.xml.html
Auto-merging test-output/testng-failed.xml
CONFLICT (content): Merge conflict in test-output/testng-failed.xml
Auto-merging test-output/testng-results.xml
CONFLICT (content): Merge conflict in test-output/testng-results.xml
Auto-merging testng.xml
CONFLICT (content): Merge conflict in testng.xml
Automatic merge failed; fix conflicts and then commit the result.