corrected location link name
fixed merge conflicts