Smartening the DataFollower
After merge