finished three_hop
fixed merge conflicts