MyClass with one more println
MyClass with one more println in a different place
MyClass with one more println in a different place
MyClass with one more println in a different place
Creating a conflict
Commit with lot's of unnecessary lines