Topic/location fix

Removes merge conflict that was kept in the code somehow