From local
Resolved conflict using server changes

Conflicts:
	file.txt
I don't understand why so many commits