Fixed Fidelity location on resume
Merging