Debugged the follower following feature
deleted merge conflict error