Which conflict resolution steps are in the right order