recomitting merge