..
..
fixed conflict in project.properties
ignore project.properties