FS-4819 --resolve we can match the one offered just for the sake of interop since it probably won't hurt anything, if it does we can take further action