diff --git a/package.json b/package.json
index d32781e2..20b16004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formio/core",
-  "version": "2.1.0-dev.tt.12",
+  "version": "2.1.0-dev.tt.13",
   "description": "The core Form.io renderering framework.",
   "main": "lib/index.js",
   "exports": {
diff --git a/src/process/validation/rules/validateRequired.ts b/src/process/validation/rules/validateRequired.ts
index 5294f481..23733e8a 100644
--- a/src/process/validation/rules/validateRequired.ts
+++ b/src/process/validation/rules/validateRequired.ts
@@ -8,11 +8,7 @@ import {
     DayComponent
 } from 'types';
 import { isEmptyObject } from '../util';
-<<<<<<< HEAD
-import { isComponentNestedDataType } from 'utils/formUtil'
-=======
 import { isComponentNestedDataType } from 'utils/formUtil';
->>>>>>> 73c7c1ec076f88b1d3ef940f41422f04a3aaaafa
 import { ProcessorInfo } from 'types/process/ProcessorInfo';
 
 const isAddressComponent = (component: any): component is AddressComponent => {