finish up merge consolidation