Getting rid of merge crap in file