created new branch for follow stuff pre-merge
fixed merge conflicts in follow model