long overdue merge