merge conflicts solved 2