[Gegl-developer] broken makefiles

[Daniel Rogers <daniel@xxxxxxxxxxxxxxxxx>]

the makefiles in gegl/gegl in cvs seem to be broken.  Here is the error 
on a "make clean"

Makefile:502: *** missing separator.  Stop.

502 of makefile.am looks like :
501: =======
502: >>>>>>> 1.61

This is not a makefile syntax I am familar with, but it seems to 
correspond with:

127: <<<<<<< Makefile.am

and there is a similar syntax in Makefile.am

What is going on here?

--
Daniel