FS-3686 --resolve no wonder I am so baffled one of the files did not save into git when I did the patch