added property parcels
resolved merge conflict