Moved price field from location model to slot model
fixed merge conflict