I want to commit the file
I change the file
Merge branch 'master' of github.com:JaxMGI/Fewi
Merge branch 'master' of github.com:JaxMGI/Fewi

Conflicts:
	HISTORY
Merge branch 'master' into olintesting
Removed stuff