cleanup/merge continued