Created simpleConflictingMergeTest, to start off TDD; test not working correctly yet though