This is a test fo commit after moving the head
c# with '#' will be ignored, and an empty message aborts the commit.
I added a line of text
Merge branch 'master' of https://github.com/fellmk/Planet into HEAD

Conflicts:
	mars.txt

test