MISC: Clean up merge