Incompatibility resolution