merging project file
Resolving merge conflicts