fix after merge fails