addressed some mergenotes