minor conflicts solved