Correctly check for conflicts when patching one field at a time
Allow patch to conflict if it is conflicting with itself