Fix places controller merge conflict
Fixed places controller merge conflict