fix project merges