more conflicts resolved