Fixing my own stupidity when merging. Issues with project file