Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision 6d44da10ada82bff3cc9cb4f6e4ab9e24722abb3)
+++ libcfa/prelude/Makefile.in	(revision c6bbcdb974c5ebafafaef230f9213f99ff0e01ce)
@@ -179,4 +179,5 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
+CFA_VERSION = @CFA_VERSION@
 CFLAGS = @CFLAGS@
 CONFIGURATION = @CONFIGURATION@
@@ -302,12 +303,6 @@
 # put into lib for now
 cfalibdir = ${CFA_LIBDIR}
-<<<<<<< HEAD
-cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
-noinst_DATA = ../src/prelude.c
+cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
-=======
-cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
->>>>>>> master
 AM_CFAFLAGS = @CONFIG_CFAFLAGS@
 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa