removing <<<<HEAD