Merge with squash
Conflicts:
	master.txt