map updated
fix conflicts in project file