Added a price to location model, and update base.yaml
Fixed merge conflict