Everything looks good except for this few lines here.
delete everything between <<<< HEAD ...    >>>> and then delete the line >>>>>master.