removed merge crap