diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index ef3f277d..e276ead6 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -95,7 +95,11 @@ var FormSchema = new Schema({
 
 		},
 		font: String,
+<<<<<<< HEAD
 		backgroundImage: { type: Schema.Types.Mixed }
+=======
+		backgroundImage: type: Schema.Types.Mixed
+>>>>>>> 33243bea2a1f74f8f417b240f5ad068c1d05c6bd
 	}
 });