Merge
Removed project.properties