fixed last merge fails