more edit to mars from planets2
resolve merge conflict