project.properties added
merged without project.properties
add project.properties