Follow-unfollow
fixed merge.