Made change to line 1
Made changes to line 3
something
Made change to line 1

Conflicts:
	MergeConflict.txt