cleaning up merging conflicts