Fixed merge conflict that occurred on the Location object