--resolve FS-5478