Removing comments and replacing $location
Fixing conflict