More conflicts solved