merge conflicts
Recommit and repair of merge conflicts