Try commit when origin has a different version of this file.
Merge branch 'master' of https://github.com/cfreas/test

Conflicts:
	tom.txt