Change merging of follow location