Fix merge errors in project file