commit
penis penis
try to commit?
clements lines are merged with my file
why
edit the file...
test
test
Merge branch 'master' of https://github.com/j2bros/j2brosProject

Conflicts:
	merge me.txt