fixed conflict in project.properties