Adding file1.txt
Changing file1
Making even more changes
Creating a conflict
Is this conflict resolved now?