recommit
merging conflicts resolved