delete some <<<<HEAD things