resolved conflict on hil_gram.h
resolved conflict on hil_gram.h

rakib-hasan/math-atlas,rakib-hasan/math-atlas,rakib-hasan/math-atlas,rakib-hasan/math-atlas,rakib-hasan/math-atlas,rakib-hasan/math-atlas