hike complete
Changes
Fixed conflict