Improve follower term conflict resolution