Resolved merge conflicts
Updated location model