merging conflicts resolved