fix broken project merging