Adding a line in the temporary copy
resolved conflict in mars.txt