Failed merge has been fixed