Remove merge conflict in code
Merge pull request #246 from notthatbreezy/topic/location-fix

Topic/location fix