removed git's <<<<<<<<<<HEAD