working on contour elevations
resolved merge conflict