fixed hiker to hikers change, pair programming
fixed merge errors