Fix broken project merges