diff --git a/.gitignore b/.gitignore
index 2c91bd37..2f7df985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build/
 *.swp
 *.swo
+.directory
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 6159679c..b60a3ffa 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -4,7 +4,11 @@ project(zint)
 
 find_package(PNG)
 
+<<<<<<< HEAD
 set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c)
+=======
+set(zint_COMMON_SRCS common.c library.c ps.c large.c reedsol.c gs1.c svg.c png.c)
+>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
 set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c)
 set(zint_POSTAL_SRCS postal.c auspost.c imail.c)
 set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c)
diff --git a/backend/library.c b/backend/library.c
index 41d81153..26c9bc69 100644
--- a/backend/library.c
+++ b/backend/library.c
@@ -92,6 +92,7 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
 {
 	if (symbol->bitmap != NULL)
 		free(symbol->bitmap);
+<<<<<<< HEAD
 
 	// If there is a rendered version, ensure it's memory is released
 	if (symbol->rendered != NULL) {
@@ -117,6 +118,8 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
 		// Free Render
 		free(symbol->rendered);
 	}
+=======
+>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
 	free(symbol);
 }
 
diff --git a/backend/zint.h b/backend/zint.h
index 80b8970e..c4d67403 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -25,6 +25,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
+<<<<<<< HEAD
 struct zint_render_line {
 	float x, y, length, width;
 	struct zint_render_line *next;      /* Pointer to next line */
@@ -43,6 +44,8 @@ struct zint_render {
 	struct zint_render_string *strings;	/* Pointer to first string */
 };
 
+=======
+>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
 struct zint_symbol {
 	int symbology;
 	int height;
@@ -68,10 +71,15 @@ struct zint_symbol {
 	char *bitmap;
 	int bitmap_width;
 	int bitmap_height;
+<<<<<<< HEAD
 	struct zint_render *rendered;
 };
 
 
+=======
+};
+
+>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
 /* Tbarcode 7 codes */
 #define BARCODE_CODE11		1
 #define BARCODE_C25MATRIX	2
diff --git a/frontend_qt4/images/.directory b/frontend_qt4/images/.directory
new file mode 100644
index 00000000..773296a4
--- /dev/null
+++ b/frontend_qt4/images/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2010,5,29,7,36,6
diff --git a/frontend_qt4/res/.directory b/frontend_qt4/res/.directory
new file mode 100644
index 00000000..1450a1d7
--- /dev/null
+++ b/frontend_qt4/res/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2010,5,29,7,59,30