removing merge conflicct lines

<<head....