Manage conflict

Manage conflict - Goals - Marlee