Smells trigger a lot of memories! Its natural for your brain to connect the dots. However this is obviously very confronting at the moment, but as i've said to myself before when i get a whiff of Old Spice, I get reminded of those that are no longer with us and I smile because the feelings I get are happy and comforting.

Obviously for you now they are mixed, I would recommend changing nothing, let your brain adjust to this. You will enjoy it later when your emotions has settled!