Resolve a conflict