More robust project merging