did the followers
resolved conflict