Tvheadend

I use 'git' to pull latest source from tvh, but it stopped working today, I get this message when I run 'git pull':

------------------------------
conny@conny-server:~/tvh/tvheadend$ git pull
remote: Counting objects: 450, done.
remote: Compressing objects: 100% (319/319), done.
Receiving objects: 100% (450/450), 443.52 KiB | 350 KiB/s, done.
remote: Total 450 (delta 177), reused 287 (delta 130)
Resolving deltas: 100% (177/177), done.
From https://github.com/tvheadend/tvheadend
+ 1745e0c...c84bc2b master > origin/master (forced update)
Auto-merging support/configure.inc
CONFLICT (content): Merge conflict in support/configure.inc
Auto-merging src/wrappers.c
CONFLICT (content): Merge conflict in src/wrappers.c
Auto-merging src/webui/webui.c
Auto-merging src/webui/static/app/status.js
CONFLICT (content): Merge conflict in src/webui/static/app/status.js
Auto-merging src/webui/static/app/idnode.js
Auto-merging src/webui/static/app/epg.js
Auto-merging src/webui/extjs.c
Auto-merging src/tvhlog.c
Auto-merging src/tvheadend.h
CONFLICT (content): Merge conflict in src/tvheadend.h
Auto-merging src/trap.c
Auto-merging src/tcp.c
CONFLICT (content): Merge conflict in src/tcp.c
Auto-merging src/service_mapper.c
Auto-merging src/main.c
CONFLICT (content): Merge conflict in src/main.c
Auto-merging src/input/mpegts/tsfile/tsfile_input.c
Auto-merging src/input/mpegts/mpegts_table.c
Auto-merging src/input/mpegts/mpegts_mux.c
Auto-merging src/input/mpegts/mpegts_input.c
CONFLICT (content): Merge conflict in src/input/mpegts/mpegts_input.c
Auto-merging src/input/mpegts/linuxdvb/scanfile.c
Auto-merging src/input/mpegts/linuxdvb/linuxdvb_satconf.c
CONFLICT (content): Merge conflict in src/input/mpegts/linuxdvb/linuxdvb_satconf.c
Auto-merging src/input/mpegts/linuxdvb/linuxdvb_private.h
CONFLICT (content): Merge conflict in src/input/mpegts/linuxdvb/linuxdvb_private.h
Auto-merging src/input/mpegts/linuxdvb/linuxdvb_mux.c
Auto-merging src/input/mpegts/linuxdvb/linuxdvb_frontend.c
CONFLICT (content): Merge conflict in src/input/mpegts/linuxdvb/linuxdvb_frontend.c
Auto-merging src/input/mpegts/linuxdvb/linuxdvb_adapter.c
CONFLICT (content): Merge conflict in src/input/mpegts/linuxdvb/linuxdvb_adapter.c
Auto-merging src/input/mpegts/linuxdvb/linuxdvb.c
CONFLICT (content): Merge conflict in src/input/mpegts/linuxdvb/linuxdvb.c
Auto-merging src/input/mpegts/iptv/iptv_mux.c
Auto-merging src/input/mpegts/iptv/iptv.c
Auto-merging src/input/mpegts/dvb_support.c
Auto-merging src/input/mpegts/dvb_psi.c
Auto-merging src/input/mpegts/dvb.h
Auto-merging src/idnode.h
Auto-merging src/idnode.c
Auto-merging src/http.c
CONFLICT (content): Merge conflict in src/http.c
Auto-merging src/htsp_server.c
Auto-merging src/fsmonitor.h
CONFLICT (add/add): Merge conflict in src/fsmonitor.h
Auto-merging src/fsmonitor.c
CONFLICT (add/add): Merge conflict in src/fsmonitor.c
Auto-merging src/epggrab/otamux.c
Auto-merging src/epggrab/module/opentv.c
Auto-merging src/epggrab/module/eit.c
Auto-merging src/epg.c
Auto-merging src/dvr/dvr.h
Auto-merging src/descrambler/cwc.c
Auto-merging src/descrambler/capmt.c
CONFLICT (content): Merge conflict in src/descrambler/capmt.c
Auto-merging src/channels.h
Auto-merging src/channels.c
Automatic merge failed; fix conflicts and then commit the result.
-------------------------------------------------------------------

And configure does not work as before:

----------------------------
conny@conny-server:~/tvh/tvheadend$ ./configure --enable-transcoder --disable-dvbscan
/home/conny/tvh/tvheadend/support/configure.inc: rad 267: syntaxfel nära den oväntade symbolen "<<<"
/home/conny/tvh/tvheadend/support/configure.inc: rad 267: `<<<<<<< HEAD'
Checking support/features
./configure: rad 70: check_cc: kommandot finns inte
ERROR: No C compiler found
---------------------------------

Is there a solution to this errors?
I have the C compiler installed.

Conny