resolve a conflict ?