fix merge conflicts

src/components/select/Select.unit.js

@@ -33,6 +33,7 @@ import {
   comp21,
   comp22,
   comp23,
+  comp24,
 } from './fixtures';
 
 // eslint-disable-next-line max-statements
@@ -1337,7 +1338,7 @@ describe('Select Component with Entire Object Value Property', () => {
 
   it('Should render label for Select components when Data Source is Resource in read only mode', (done) => {
     const element = document.createElement('div');
-    Formio.createForm(element, comp23, { readOnly: true }).then((form) => {
+    Formio.createForm(element, comp24, { readOnly: true }).then((form) => {
       const select = form.getComponent('select');
       form.setSubmission({
         metadata: {
@@ -1399,4 +1400,3 @@ describe('Select Component with Entire Object Value Property', () => {
       .catch((err) => done(err));
   });
 });
-

src/components/select/fixtures/comp24.js

@@ -0,0 +1,38 @@
+export default {
+  title: 'FIO-8234',
+  name: 'fio8234',
+  path: 'fio8234',
+  type: 'form',
+  display: 'form',
+  components: [
+    {
+      label: 'Select',
+      widget: 'choicesjs',
+      tableView: true,
+      dataSrc: 'resource',
+      data: {
+        resource: '665446284c9b0163c3e0c7e6',
+      },
+      template: '<span>{{ item.data.textField1 }}</span>',
+      validate: {
+        select: false,
+      },
+      key: 'select',
+      type: 'select',
+      searchField: 'data.textField2__regex',
+      input: true,
+      noRefreshOnScroll: false,
+      addResource: false,
+      reference: false,
+      valueProperty: 'data.textField2',
+    },
+    {
+      type: 'button',
+      label: 'Submit',
+      key: 'submit',
+      disableOnInvalid: true,
+      input: true,
+      tableView: false,
+    },
+  ],
+};

src/components/select/fixtures/index.js

@@ -21,4 +21,5 @@ import comp20 from './comp20';
 import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23 };
+import comp24 from './comp24';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24 };