locations dictionary blind commit
removing unused code
resolving merge conflict
merge