Updated merge conflict in projects.properties.