More conflicts resolved