modiied mars in home folder
modified mars because of conflict