New merging conflicts resolved