office hours 2
resolving conflict