error in merge fixed