- conflicts resolved