Fixed the merge crap