merge conflicts solved