Fixed real estate agent bugs
Fixed merge