conflicts resolved