Fixed broken project files due to bad merge