conflicts resolved three