fixes project file borked by merge