cleaned up merge trash