FS-5013 --resolve better to submit here and I can tell you when you can commit