Fixed merge conflicts after removing non-project file