resolve a conflict