Re-added files that were removed from the project file during merge