added comments for our location section
resolved merge conflicts