cleaned up merge crap