Failed merge fixed