fix project after merge