diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 62e744b47..6fa1391e5 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -19,7 +19,7 @@ liblumibackend_a_srcdir = $(top_srcdir)/src/backend
 noinst_LIBRARIES += liblumibackend.a
 
 liblumibackend_a_CPPFLAGS = $(AM_CPPFLAGS)
-liblumibackend_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+liblumibackend_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall
 
 liblumibackend_a_SOURCES =					\
 	$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp	\
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 3e712ce8a..6bac5c0e0 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -20,15 +20,14 @@ lumigui_srcdir = $(top_srcdir)/src/gui
 
 #lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
 
-lumigui_CPPFLAGS = $(AM_CPPFLAGS)					\
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"				\
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
+lumigui_CPPFLAGS = $(AM_CPPFLAGS)											\
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"				\
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"										\
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\"										\
 	$(LUMIERA_GUI_CFLAGS)
 
 bin_PROGRAMS += lumigui
 
-<<<<<<< HEAD:src/gui/Makefile.am
 lumigui_SOURCES =															\
 	$(lumigui_srcdir)/gtk-lumiera.cpp										\
 	$(lumigui_srcdir)/gtk-lumiera.hpp										\
@@ -83,14 +82,14 @@ lumigui_SOURCES =															\
 	$(lumigui_srcdir)/model/project.hpp										\
 	$(lumigui_srcdir)/model/track.cpp										\
 	$(lumigui_srcdir)/model/track.hpp										\
-	$(lumigui_srcdir)/model/clip-track.cpp									\
-	$(lumigui_srcdir)/model/clip-track.hpp									\
 	$(lumigui_srcdir)/model/parent-track.cpp								\
 	$(lumigui_srcdir)/model/parent-track.hpp								\
-	$(lumigui_srcdir)/model/sequence.cpp									\
-	$(lumigui_srcdir)/model/sequence.hpp									\
 	$(lumigui_srcdir)/model/group-track.cpp									\
 	$(lumigui_srcdir)/model/group-track.hpp									\
+	$(lumigui_srcdir)/model/sequence.cpp									\
+	$(lumigui_srcdir)/model/sequence.hpp									\
+	$(lumigui_srcdir)/model/clip-track.cpp									\
+	$(lumigui_srcdir)/model/clip-track.hpp									\
 	$(lumigui_srcdir)/model/clip.cpp										\
 	$(lumigui_srcdir)/model/clip.hpp										\
 	$(lumigui_srcdir)/output/displayer.cpp									\
@@ -98,77 +97,6 @@ lumigui_SOURCES =															\
 	$(lumigui_srcdir)/output/gdkdisplayer.cpp								\
 	$(lumigui_srcdir)/output/gdkdisplayer.hpp								\
 	$(lumigui_srcdir)/output/xvdisplayer.cpp								\
-=======
-lumigui_SOURCES =								\
-	$(lumigui_srcdir)/gtk-lumiera.cpp					\
-	$(lumigui_srcdir)/gtk-lumiera.hpp					\
-	$(lumigui_srcdir)/window-manager.cpp					\
-	$(lumigui_srcdir)/window-manager.hpp					\
-	$(lumigui_srcdir)/workspace/actions.cpp					\
-	$(lumigui_srcdir)/workspace/actions.hpp					\
-	$(lumigui_srcdir)/workspace/workspace-window.cpp			\
-	$(lumigui_srcdir)/workspace/workspace-window.hpp			\
-	$(lumigui_srcdir)/dialogs/dialog.hpp					\
-	$(lumigui_srcdir)/dialogs/render.cpp					\
-	$(lumigui_srcdir)/dialogs/render.hpp					\
-	$(lumigui_srcdir)/dialogs/preferences-dialog.cpp			\
-	$(lumigui_srcdir)/dialogs/preferences-dialog.hpp			\
-	$(lumigui_srcdir)/dialogs/sequence-name.cpp				\
-	$(lumigui_srcdir)/dialogs/sequence-name.hpp				\
-	$(lumigui_srcdir)/panels/panel.cpp					\
-	$(lumigui_srcdir)/panels/panel.hpp					\
-	$(lumigui_srcdir)/panels/timeline-panel.cpp				\
-	$(lumigui_srcdir)/panels/timeline-panel.hpp				\
-	$(lumigui_srcdir)/panels/viewer-panel.cpp				\
-	$(lumigui_srcdir)/panels/viewer-panel.hpp				\
-	$(lumigui_srcdir)/panels/assets-panel.cpp				\
-	$(lumigui_srcdir)/panels/assets-panel.hpp				\
-	$(lumigui_srcdir)/widgets/video-display-widget.cpp			\
-	$(lumigui_srcdir)/widgets/video-display-widget.hpp			\
-	$(lumigui_srcdir)/widgets/timeline-widget.cpp				\
-	$(lumigui_srcdir)/widgets/timeline-widget.hpp				\
-	$(lumigui_srcdir)/widgets/timeline/timeline-view-window.cpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-view-window.hpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-header-container.cpp	\
-	$(lumigui_srcdir)/widgets/timeline/timeline-header-container.hpp	\
-	$(lumigui_srcdir)/widgets/timeline/timeline-body.cpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-body.hpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-ruler.cpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-ruler.hpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-tool.cpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-tool.hpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-track.cpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-track.hpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.cpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.hpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-group-track.cpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-group-track.hpp		\
-	$(lumigui_srcdir)/widgets/timeline/timeline-clip.cpp			\
-	$(lumigui_srcdir)/widgets/timeline/timeline-clip.hpp			\
-	$(lumigui_srcdir)/model/project.cpp					\
-	$(lumigui_srcdir)/model/project.hpp					\
-	$(lumigui_srcdir)/model/track-base.cpp					\
-	$(lumigui_srcdir)/model/track-base.hpp					\
-	$(lumigui_srcdir)/model/sequence.cpp					\
-	$(lumigui_srcdir)/model/sequence.hpp					\
-	$(lumigui_srcdir)/model/track.cpp					\
-	$(lumigui_srcdir)/model/track.hpp					\
-	$(lumigui_srcdir)/model/clip-track.cpp					\
-	$(lumigui_srcdir)/model/clip-track.hpp					\
-	$(lumigui_srcdir)/model/group-track.cpp					\
-	$(lumigui_srcdir)/model/group-track.hpp					\
-	$(lumigui_srcdir)/model/clip.cpp					\
-	$(lumigui_srcdir)/model/clip.hpp					\
-	$(lumigui_srcdir)/output/displayer.cpp					\
-	$(lumigui_srcdir)/output/displayer.hpp					\
-	$(lumigui_srcdir)/output/gdkdisplayer.cpp				\
-	$(lumigui_srcdir)/output/gdkdisplayer.hpp				\
-	$(lumigui_srcdir)/output/xvdisplayer.cpp				\
->>>>>>> 9a1a1890e27942a7f45a3593f525c55cb5e8d8cb:src/gui/Makefile.am
 	$(lumigui_srcdir)/output/xvdisplayer.hpp
 
 lumigui_LDFLAGS =