Added missing files to project file after merge