update announcements
cleanup merge