How best to resolve a conflict