minor merge conflicts solved