resolved conflict notation section 6