fix project merge