Fixed merge conflict
Merge two branches

Conflicts:
	mars.txt