step 3 for distance
Merge remote-tracking branch 'origin/master'