Property location

check it out and merge if it looks ok