conflict resolving pt 3