clean up merge artifacts