fixed merge fails