Fixed merge fails