more conflicts solved