Removed some merge notes