I added a line
add something
Merge branch 'master' of https://github.com/dataclip/planets

Conflicts:
	mars.txt