remove extraneous <<< HEAD
shift to ido from helm and other cleanups