Ditch extra file from previous merge conflict

Got rid of crap