Fixing simultaneous project merging