merging conflicts solved