fixed project.properties conflicts

Just update the project.properties