Update conflicting patch