removed <<< HEAD>>> origin/master added by github