From 5acc7671a340e74188b2c5507de83c1b7e32adcc Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Tue, 26 May 2020 23:38:15 +0800
Subject: [PATCH] test: update snap

---
 antdv-demo                                    |    2 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   27 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    8 -
 .../__tests__/__snapshots__/demo.test.js.snap |   23 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    7 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    9 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   51 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   11 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   56 +-
 .../__snapshots__/index.test.js.snap          |    2 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   32 +-
 .../__snapshots__/index.test.js.snap          | 1680 ++---------------
 .../__tests__/__snapshots__/demo.test.js.snap |   63 +-
 .../__tests__/__snapshots__/demo.test.js.snap |   81 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    3 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    8 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    8 +-
 .../__tests__/__snapshots__/demo.test.js.snap |    2 +-
 18 files changed, 250 insertions(+), 1823 deletions(-)

diff --git a/antdv-demo b/antdv-demo
index 745711870..814b848de 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 7457118702fced496e8b1d251b1ea2c50cd5071a
+Subproject commit 814b848dea1d5877f17987d512a0d74fdc99cb1a
diff --git a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
index 127d4bd27..332ecec08 100644
--- a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
@@ -1,30 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders ./antdv-demo/docs/auto-complete/demo/basic.md correctly 1`] = `
-<<<<<<< HEAD
-<div>
-  <div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
-    <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-      <div class="ant-select-selection__rendered">
-        <ul>
-          <li class="ant-select-search ant-select-search--inline">
-            <div class="ant-select-search__field__wrap"><input placeholder="input here" type="text" value="" class="ant-input ant-select-search__field"><span class="ant-select-search__field__mirror">&nbsp;</span></div>
-          </li>
-        </ul>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-    </div>
-  </div> <br> <br>
-  <div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
-    <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-      <div class="ant-select-selection__rendered">
-        <ul>
-          <li class="ant-select-search ant-select-search--inline">
-            <div class="ant-select-search__field__wrap"><input placeholder="control mode" type="text" value="" class="ant-input ant-select-search__field"><span class="ant-select-search__field__mirror">&nbsp;</span></div>
-          </li>
-        </ul>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-    </div>
-=======
 <div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
     <div class="ant-select-selection__rendered">
@@ -33,8 +9,7 @@ exports[`renders ./antdv-demo/docs/auto-complete/demo/basic.md correctly 1`] = `
           <div class="ant-select-search__field__wrap"><input placeholder="input here" type="text" value="" class="ant-input ant-select-search__field"><span class="ant-select-search__field__mirror">&nbsp;</span></div>
         </li>
       </ul>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
   </div>
 </div>
 `;
diff --git a/components/avatar/__tests__/__snapshots__/demo.test.js.snap b/components/avatar/__tests__/__snapshots__/demo.test.js.snap
index f0f3d1961..db07c706d 100644
--- a/components/avatar/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/avatar/__tests__/__snapshots__/demo.test.js.snap
@@ -15,12 +15,4 @@ exports[`renders ./antdv-demo/docs/avatar/demo/dynamic.md correctly 1`] = `
   </span></span> <button type="button" class="ant-btn ant-btn-sm" style="vertical-align: middle;"><span>改 变</span></button></div>
 `;
 
-<<<<<<< HEAD
 exports[`renders ./antdv-demo/docs/avatar/demo/type.md correctly 1`] = `<div><span class="ant-avatar ant-avatar-circle ant-avatar-icon"><span role="img" aria-label="user" class="anticon anticon-user"><svg viewBox="64 64 896 896" focusable="false" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M858.5 763.6a374 374 0 00-80.6-119.5 375.63 375.63 0 00-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 00-80.6 119.5A371.7 371.7 0 00136 901.8a8 8 0 008 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 008-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></span></span> <span class="ant-avatar ant-avatar-circle"><span class="ant-avatar-string" style="opacity: 0;">U</span></span> <span class="ant-avatar ant-avatar-circle"><span class="ant-avatar-string" style="opacity: 0;">USER</span></span> <span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"></span> <span class="ant-avatar ant-avatar-circle" style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207);"><span class="ant-avatar-string" style="opacity: 0;">U</span></span> <span class="ant-avatar ant-avatar-circle ant-avatar-icon" style="background-color: rgb(135, 208, 104);"><span role="img" aria-label="user" class="anticon anticon-user"><svg viewBox="64 64 896 896" focusable="false" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M858.5 763.6a374 374 0 00-80.6-119.5 375.63 375.63 0 00-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 00-80.6 119.5A371.7 371.7 0 00136 901.8a8 8 0 008 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 008-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></span></span></div>`;
-=======
-exports[`renders ./antdv-demo/docs/avatar/demo/type.md correctly 1`] = `
-<div><span class="ant-avatar ant-avatar-circle ant-avatar-icon"><i aria-label="icon: user" class="anticon anticon-user"><svg viewBox="64 64 896 896" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M858.5 763.6a374 374 0 0 0-80.6-119.5 375.63 375.63 0 0 0-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 0 0-80.6 119.5A371.7 371.7 0 0 0 136 901.8a8 8 0 0 0 8 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 0 0 8-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></i></span> <span class="ant-avatar ant-avatar-circle ant-avatar-icon"><i aria-label="icon: user" class="anticon anticon-user"><svg viewBox="64 64 896 896" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M858.5 763.6a374 374 0 0 0-80.6-119.5 375.63 375.63 0 0 0-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 0 0-80.6 119.5A371.7 371.7 0 0 0 136 901.8a8 8 0 0 0 8 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 0 0 8-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></i></span> <span class="ant-avatar ant-avatar-circle"><span class="ant-avatar-string" style="opacity: 0;">U</span></span> <span class="ant-avatar ant-avatar-circle"><span class="ant-avatar-string" style="opacity: 0;">USER</span></span> <span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"></span> <span class="ant-avatar ant-avatar-circle" style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207);"><span class="ant-avatar-string" style="opacity: 0;">
-    U
-  </span></span> <span class="ant-avatar ant-avatar-circle ant-avatar-icon" style="background-color: rgb(135, 208, 104);"><i aria-label="icon: user" class="anticon anticon-user"><svg viewBox="64 64 896 896" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M858.5 763.6a374 374 0 0 0-80.6-119.5 375.63 375.63 0 0 0-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 0 0-80.6 119.5A371.7 371.7 0 0 0 136 901.8a8 8 0 0 0 8 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 0 0 8-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></i></span></div>
-`;
->>>>>>> origin/master
diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap
index ae6cd326b..6508d242e 100644
--- a/components/button/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/button/__tests__/__snapshots__/demo.test.js.snap
@@ -32,32 +32,13 @@ exports[`renders ./antdv-demo/docs/button/demo/multiple.md correctly 1`] = `<div
 
 exports[`renders ./antdv-demo/docs/button/demo/size.md correctly 1`] = `
 <div>
-<<<<<<< HEAD
-  <div class="ant-radio-group ant-radio-group-outline ant-radio-group-default"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="large"><span class="ant-radio-button-inner"></span></span><span>Large</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="default"><span class="ant-radio-button-inner"></span></span><span>Default</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="small"><span class="ant-radio-button-inner"></span></span><span>Small</span></label></div> <br><br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><span>Primary</span></button> <button type="button" class="ant-btn ant-btn-lg"><span>Normal</span></button> <button type="button" class="ant-btn ant-btn-dashed ant-btn-lg"><span>Dashed</span></button> <button type="button" class="ant-btn ant-btn-danger ant-btn-lg"><span>Danger</span></button> <button type="button" class="ant-btn ant-btn-link ant-btn-lg"><span>Link</span></button> <br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-circle ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span><span>Download</span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span><span>Download</span></button> <br>
-  <div class="ant-btn-group ant-btn-group-lg"><button type="button" class="ant-btn ant-btn-primary"><span role="img" aria-label="left" class="anticon anticon-left"><svg viewBox="64 64 896 896" focusable="false" data-icon="left" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path></svg></span><span>Backward</span></button><button type="button" class="ant-btn ant-btn-primary"><span>Forward</span><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></button></div>
-=======
   <div class="ant-radio-group ant-radio-group-outline ant-radio-group-default"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="large"><span class="ant-radio-button-inner"></span></span><span>
       Large
     </span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="default"><span class="ant-radio-button-inner"></span></span><span>
       Default
     </span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="small"><span class="ant-radio-button-inner"></span></span><span>
       Small
-    </span></label></div> <br><br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><span>Primary</span></button> <button type="button" class="ant-btn ant-btn-lg"><span>Normal</span></button> <button type="button" class="ant-btn ant-btn-dashed ant-btn-lg"><span>Dashed</span></button> <button type="button" class="ant-btn ant-btn-danger ant-btn-lg"><span>Danger</span></button> <button type="button" class="ant-btn ant-btn-link ant-btn-lg"><span>Link</span></button> <br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"><i aria-label="icon: download" class="anticon anticon-download"><svg viewBox="64 64 896 896" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-        <path d="M505.7 661a8 8 0 0 0 12.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path>
-      </svg></i></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-circle ant-btn-lg ant-btn-icon-only"><i aria-label="icon: download" class="anticon anticon-download"><svg viewBox="64 64 896 896" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-        <path d="M505.7 661a8 8 0 0 0 12.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path>
-      </svg></i></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg ant-btn-icon-only"><i aria-label="icon: download" class="anticon anticon-download"><svg viewBox="64 64 896 896" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-        <path d="M505.7 661a8 8 0 0 0 12.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path>
-      </svg></i></button>Download <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg ant-btn-icon-only"><i aria-label="icon: download" class="anticon anticon-download"><svg viewBox="64 64 896 896" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-        <path d="M505.7 661a8 8 0 0 0 12.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path>
-      </svg></i></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><i aria-label="icon: download" class="anticon anticon-download"><svg viewBox="64 64 896 896" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-        <path d="M505.7 661a8 8 0 0 0 12.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path>
-      </svg></i><span>Download</span></button> <br>
-  <div class="ant-btn-group ant-btn-group-lg"><button type="button" class="ant-btn ant-btn-primary"><i aria-label="icon: left" class="anticon anticon-left"><svg viewBox="64 64 896 896" data-icon="left" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-          <path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 0 0 0 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path>
-        </svg></i><span>Backward</span></button><button type="button" class="ant-btn ant-btn-primary"><span>Forward</span><i aria-label="icon: right" class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-          <path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path>
-        </svg></i></button></div>
->>>>>>> origin/master
+    </span></label></div> <br><br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><span>Primary</span></button> <button type="button" class="ant-btn ant-btn-lg"><span>Normal</span></button> <button type="button" class="ant-btn ant-btn-dashed ant-btn-lg"><span>Dashed</span></button> <button type="button" class="ant-btn ant-btn-danger ant-btn-lg"><span>Danger</span></button> <button type="button" class="ant-btn ant-btn-link ant-btn-lg"><span>Link</span></button> <br> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-circle ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span><span>Download</span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-round ant-btn-lg ant-btn-icon-only"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span></button> <button type="button" class="ant-btn ant-btn-primary ant-btn-lg"><span role="img" aria-label="download" class="anticon anticon-download"><svg viewBox="64 64 896 896" focusable="false" data-icon="download" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z"></path></svg></span><span>Download</span></button> <br>
+  <div class="ant-btn-group ant-btn-group-lg"><button type="button" class="ant-btn ant-btn-primary"><span role="img" aria-label="left" class="anticon anticon-left"><svg viewBox="64 64 896 896" focusable="false" data-icon="left" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path></svg></span><span>Backward</span></button><button type="button" class="ant-btn ant-btn-primary"><span>Forward</span><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></button></div>
 </div>
 `;
diff --git a/components/collapse/__tests__/__snapshots__/demo.test.js.snap b/components/collapse/__tests__/__snapshots__/demo.test.js.snap
index 4e6d1b138..f72a55c92 100644
--- a/components/collapse/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/collapse/__tests__/__snapshots__/demo.test.js.snap
@@ -114,15 +114,10 @@ exports[`renders ./antdv-demo/docs/collapse/demo/extra.md correctly 1`] = `
   <div tabindex="0" class="ant-select ant-select-enabled">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="left" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">left</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
         <div title="left" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           left
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
     </div>
   </div>
 </div>
diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
index 102f10ea8..aae20b792 100644
--- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
@@ -18,19 +18,14 @@ exports[`renders ./antdv-demo/docs/date-picker/demo/presetted-ranges.md correctl
 
 exports[`renders ./antdv-demo/docs/date-picker/demo/size.md correctly 1`] = `
 <div>
-<<<<<<< HEAD
-  <div class="ant-radio-group ant-radio-group-outline ant-radio-group-default"><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="large"><span class="ant-radio-button-inner"></span></span><span>Large</span></label><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="default"><span class="ant-radio-button-inner"></span></span><span>Default</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="small"><span class="ant-radio-button-inner"></span></span><span>Small</span></label></div> <br><br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span>
-</div></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select Month" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span> <br> <span tabindex="0" class="ant-calendar-picker ant-calendar-picker-default"><span class="ant-calendar-picker-input ant-input"><input readonly="true" placeholder="Start date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-range-picker-separator"> ~ </span><input readonly="true" placeholder="End date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-picker-icon"></span></span></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><span class="" style="display: inline-block; width: 100%;"><input readonly="true" placeholder="Select Week" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon"></span></span></span></div>
-=======
   <div class="ant-radio-group ant-radio-group-outline ant-radio-group-default"><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="large"><span class="ant-radio-button-inner"></span></span><span>
       Large
     </span></label><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="default"><span class="ant-radio-button-inner"></span></span><span>
       Default
     </span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="small"><span class="ant-radio-button-inner"></span></span><span>
       Small
-    </span></label></div> <br><br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><i aria-label="icon: calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></i></div></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select Month" class="ant-calendar-picker-input ant-input"><i aria-label="icon: calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></i></div></span> <br> <span tabindex="0" class="ant-calendar-picker ant-calendar-picker-default"><span class="ant-calendar-picker-input ant-input"><input readonly="true" placeholder="Start date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-range-picker-separator"> ~ </span><input readonly="true" placeholder="End date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-picker-icon"></span></span></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><span class="" style="display: inline-block; width: 100%;"><input readonly="true" placeholder="Select Week" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon"></span></span></span>
-</div>
->>>>>>> origin/master
+    </span></label></div> <br><br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span>
+</div></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><div class=""><input readonly="true" placeholder="Select Month" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span> <br> <span tabindex="0" class="ant-calendar-picker ant-calendar-picker-default"><span class="ant-calendar-picker-input ant-input"><input readonly="true" placeholder="Start date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-range-picker-separator"> ~ </span><input readonly="true" placeholder="End date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-picker-icon"></span></span></span> <br> <span class="ant-calendar-picker ant-calendar-picker-default"><span class="" style="display: inline-block; width: 100%;"><input readonly="true" placeholder="Select Week" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon"></span></span></span></div>
 `;
 
 exports[`renders ./antdv-demo/docs/date-picker/demo/start-end.md correctly 1`] = `<div><span class="ant-calendar-picker" style="min-width: 195px;"><div class=""><input readonly="true" placeholder="Start" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span> <span class="ant-calendar-picker" style="min-width: 195px;"><div class=""><input readonly="true" placeholder="End" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span></div>`;
diff --git a/components/empty/__tests__/__snapshots__/demo.test.js.snap b/components/empty/__tests__/__snapshots__/demo.test.js.snap
index d731a61c5..58bd1b520 100644
--- a/components/empty/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/empty/__tests__/__snapshots__/demo.test.js.snap
@@ -92,34 +92,33 @@ exports[`renders ./antdv-demo/docs/empty/demo/config-provider.md correctly 1`] =
                   <thead class="ant-table-thead">
                     <tr>
                       <th key="name" class=""><span class="ant-table-header-column"><div><span class="ant-table-column-title">Name</span><span class="ant-table-column-sorter"></span>
-              </div>
-    </span></th>
-    <th key="age" class="ant-table-row-cell-last"><span class="ant-table-header-column"><div><span class="ant-table-column-title">Age</span><span class="ant-table-column-sorter"></span>
-  </div></span></th>
-  </tr>
-  </thead>
-  <tbody class="ant-table-tbody"></tbody>
-  </table>
-</div>
-<div class="ant-table-placeholder">
-  <div class="ant-empty ant-empty-normal">
-    <div class="ant-empty-image"><svg width="64" height="41" viewBox="0 0 64 41" xmlns="http://www.w3.org/2000/svg">
-        <g transform="translate(0 1)" fill="none" fillRule="evenodd">
-          <ellipse fill="#F5F5F5" cx="32" cy="33" rx="32" ry="7"></ellipse>
-          <g fillRule="nonzero" stroke="#D9D9D9">
-            <path d="M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z"></path>
-            <path d="M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z" fill="#FAFAFA"></path>
-          </g>
-        </g>
-      </svg></div>
-    <p class="ant-empty-description">No Data</p>
+              </div></span></th>
+              <th key="age" class="ant-table-row-cell-last"><span class="ant-table-header-column"><div><span class="ant-table-column-title">Age</span><span class="ant-table-column-sorter"></span>
+            </div></span></th>
+            </tr>
+            </thead>
+            <tbody class="ant-table-tbody"></tbody>
+            </table>
+          </div>
+          <div class="ant-table-placeholder">
+            <div class="ant-empty ant-empty-normal">
+              <div class="ant-empty-image"><svg width="64" height="41" viewBox="0 0 64 41" xmlns="http://www.w3.org/2000/svg">
+                  <g transform="translate(0 1)" fill="none" fillRule="evenodd">
+                    <ellipse fill="#F5F5F5" cx="32" cy="33" rx="32" ry="7"></ellipse>
+                    <g fillRule="nonzero" stroke="#D9D9D9">
+                      <path d="M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z"></path>
+                      <path d="M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z" fill="#FAFAFA"></path>
+                    </g>
+                  </g>
+                </svg></div>
+              <p class="ant-empty-description">No Data</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
-</div>
-</div>
-</div>
-</div>
-</div>
 <h3>List</h3>
 <div class="ant-list ant-list-split">
   <div class="ant-spin-nested-loading">
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap
index 18cc6c00c..97fd53963 100644
--- a/components/form/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/form/__tests__/__snapshots__/demo.test.js.snap
@@ -380,11 +380,7 @@ exports[`renders ./antdv-demo/docs/form/demo/register.vue correctly 1`] = `
   <div class="ant-row ant-form-item">
     <div class="ant-col ant-col-xs-24 ant-col-sm-8 ant-form-item-label"><label for="register_nickname" title="" class="ant-form-item-required"><span>
       Nickname&nbsp;
-<<<<<<< HEAD
       <span role="img" aria-label="question-circle" class="anticon anticon-question-circle"><svg viewBox="64 64 896 896" focusable="false" data-icon="question-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M623.6 316.7C593.6 290.4 554 276 512 276s-81.6 14.5-111.6 40.7C369.2 344 352 380.7 352 420v7.6c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V420c0-44.1 43.1-80 96-80s96 35.9 96 80c0 31.1-22 59.6-56.1 72.7-21.2 8.1-39.2 22.3-52.1 40.9-13.1 19-19.9 41.8-19.9 64.9V620c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-22.7a48.3 48.3 0 0130.9-44.8c59-22.7 97.1-74.7 97.1-132.5.1-39.3-17.1-76-48.3-103.3zM472 732a40 40 0 1080 0 40 40 0 10-80 0z"></path></svg></span></span></label></div>
-=======
-      <i aria-label="icon: question-circle-o" class="anticon anticon-question-circle-o"><svg viewBox="64 64 896 896" data-icon="question-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M623.6 316.7C593.6 290.4 554 276 512 276s-81.6 14.5-111.6 40.7C369.2 344 352 380.7 352 420v7.6c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V420c0-44.1 43.1-80 96-80s96 35.9 96 80c0 31.1-22 59.6-56.1 72.7-21.2 8.1-39.2 22.3-52.1 40.9-13.1 19-19.9 41.8-19.9 64.9V620c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-22.7a48.3 48.3 0 0 1 30.9-44.8c59-22.7 97.1-74.7 97.1-132.5.1-39.3-17.1-76-48.3-103.3zM472 732a40 40 0 1 0 80 0 40 40 0 1 0-80 0z"></path></svg></i></span></label></div>
->>>>>>> origin/master
     <div class="ant-col ant-col-xs-24 ant-col-sm-16 ant-form-item-control-wrapper">
       <div class="ant-form-item-control"><span class="ant-form-item-children"><input type="text" data-__meta="[object Object]" data-__field="[object Object]" id="register_nickname" class="ant-input"></span>
         <!---->
@@ -791,10 +787,9 @@ exports[`renders ./antdv-demo/docs/form/demo/validate-static.vue correctly 1`] =
     </span>
   <div class="ant-row ant-form-item" style="display: inline-block;">
     <div class="ant-col ant-form-item-control-wrapper">
-      <div class="ant-form-item-control"><span class="ant-form-item-children"><span class="ant-calendar-picker" style="width: 100%;"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div>
-  </span></span>
-  <!---->
-  </div>
+      <div class="ant-form-item-control"><span class="ant-form-item-children"><span class="ant-calendar-picker" style="width: 100%;"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span></span>
+      <!---->
+    </div>
   </div>
   </div></span>
   <!---->
diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 9e0d6d758..7f3228beb 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -3,17 +3,12 @@
 exports[`renders ./antdv-demo/docs/input/demo/addon.md correctly 1`] = `
 <div>
   <div style="margin-bottom: 16px;"><span class="ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><span class="ant-input-group-addon">Http://</span><input type="text" class="ant-input"><span class="ant-input-group-addon">.com</span></span></span></div>
-<<<<<<< HEAD
-  <div style="margin-bottom: 16px;"><span class="ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><span class="ant-input-group-addon"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 90px;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Http://" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Http://</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-</div></span><input type="text" class="ant-input"><span class="ant-input-group-addon"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 80px;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title=".com" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">.com</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-=======
   <div style="margin-bottom: 16px;"><span class="ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><span class="ant-input-group-addon"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 90px;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Http://" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Http://
-        </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
+        </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div></span><input type="text" class="ant-input"><span class="ant-input-group-addon"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 80px;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title=".com" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           .com
-        </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
->>>>>>> origin/master
+        </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div></span></span></span></div>
 <div style="margin-bottom: 16px;"><span class="ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><input type="text" class="ant-input"><span class="ant-input-group-addon"><span role="img" aria-label="setting" class="anticon anticon-setting"><svg viewBox="64 64 896 896" focusable="false" data-icon="setting" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M924.8 625.7l-65.5-56c3.1-19 4.7-38.4 4.7-57.8s-1.6-38.8-4.7-57.8l65.5-56a32.03 32.03 0 009.3-35.2l-.9-2.6a443.74 443.74 0 00-79.7-137.9l-1.8-2.1a32.12 32.12 0 00-35.1-9.5l-81.3 28.9c-30-24.6-63.5-44-99.7-57.6l-15.7-85a32.05 32.05 0 00-25.8-25.7l-2.7-.5c-52.1-9.4-106.9-9.4-159 0l-2.7.5a32.05 32.05 0 00-25.8 25.7l-15.8 85.4a351.86 351.86 0 00-99 57.4l-81.9-29.1a32 32 0 00-35.1 9.5l-1.8 2.1a446.02 446.02 0 00-79.7 137.9l-.9 2.6c-4.5 12.5-.8 26.5 9.3 35.2l66.3 56.6c-3.1 18.8-4.6 38-4.6 57.1 0 19.2 1.5 38.4 4.6 57.1L99 625.5a32.03 32.03 0 00-9.3 35.2l.9 2.6c18.1 50.4 44.9 96.9 79.7 137.9l1.8 2.1a32.12 32.12 0 0035.1 9.5l81.9-29.1c29.8 24.5 63.1 43.9 99 57.4l15.8 85.4a32.05 32.05 0 0025.8 25.7l2.7.5a449.4 449.4 0 00159 0l2.7-.5a32.05 32.05 0 0025.8-25.7l15.7-85a350 350 0 0099.7-57.6l81.3 28.9a32 32 0 0035.1-9.5l1.8-2.1c34.8-41.1 61.6-87.5 79.7-137.9l.9-2.6c4.5-12.3.8-26.3-9.3-35zM788.3 465.9c2.5 15.1 3.8 30.6 3.8 46.1s-1.3 31-3.8 46.1l-6.6 40.1 74.7 63.9a370.03 370.03 0 01-42.6 73.6L721 702.8l-31.4 25.8c-23.9 19.6-50.5 35-79.3 45.8l-38.1 14.3-17.9 97a377.5 377.5 0 01-85 0l-17.9-97.2-37.8-14.5c-28.5-10.8-55-26.2-78.7-45.7l-31.4-25.9-93.4 33.2c-17-22.9-31.2-47.6-42.6-73.6l75.5-64.5-6.5-40c-2.4-14.9-3.7-30.3-3.7-45.5 0-15.3 1.2-30.6 3.7-45.5l6.5-40-75.5-64.5c11.3-26.1 25.6-50.7 42.6-73.6l93.4 33.2 31.4-25.9c23.7-19.5 50.2-34.9 78.7-45.7l37.9-14.3 17.9-97.2c28.1-3.2 56.8-3.2 85 0l17.9 97 38.1 14.3c28.7 10.8 55.4 26.2 79.3 45.8l31.4 25.8 92.8-32.9c17 22.9 31.2 47.6 42.6 73.6L781.8 426l6.5 39.9zM512 326c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zm79.2 255.2A111.6 111.6 0 01512 614c-29.9 0-58-11.7-79.2-32.8A111.6 111.6 0 01400 502c0-29.9 11.7-58 32.8-79.2C454 401.6 482.1 390 512 390c29.9 0 58 11.6 79.2 32.8A111.6 111.6 0 01624 502c0 29.9-11.7 58-32.8 79.2z"></path></svg></span></span></span></span></div>
 </div>
@@ -31,44 +26,30 @@ exports[`renders ./antdv-demo/docs/input/demo/autosize-textarea.md correctly 1`]
 exports[`renders ./antdv-demo/docs/input/demo/basic.md correctly 1`] = `<input placeholder="Basic usage" type="text" class="ant-input">`;
 
 exports[`renders ./antdv-demo/docs/input/demo/group.md correctly 1`] = `
-<<<<<<< HEAD
-<div><span class="ant-input-group ant-input-group-lg"><div class="ant-row" style="margin-left: -4px; margin-right: -4px;"><div class="ant-col ant-col-5" style="padding-left: 4px; padding-right: 4px;"><input type="text" class="ant-input"></div> <div class="ant-col ant-col-8" style="padding-left: 4px; padding-right: 4px;"><input type="text" class="ant-input"></div></div></span> <br> <span class="ant-input-group ant-input-group-compact"><input type="text" class="ant-input" style="width: 20%;"><input type="text" class="ant-input" style="width: 30%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Zhejiang" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Zhejiang</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-</div><input type="text" class="ant-input" style="width: 50%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Option1" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Option1</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-</div><input type="text" class="ant-input" style="width: 50%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><input type="text" class="ant-input" style="width: 50%;"><span class="ant-calendar-picker" style="width: 50%;"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Option1-1" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Option1-1</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-=======
 <div><span class="ant-input-group ant-input-group-lg"><div class="ant-row" style="margin-left: -4px; margin-right: -4px;"><div class="ant-col ant-col-5" style="padding-left: 4px; padding-right: 4px;"><input type="text" class="ant-input"></div> <div class="ant-col ant-col-8" style="padding-left: 4px; padding-right: 4px;"><input type="text" class="ant-input"></div></div></span> <br> <span class="ant-input-group ant-input-group-compact"><input type="text" class="ant-input" style="width: 20%;"><input type="text" class="ant-input" style="width: 30%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Zhejiang" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Zhejiang
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div><input type="text" class="ant-input" style="width: 50%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Option1" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Option1
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
-</div><input type="text" class="ant-input" style="width: 50%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><input type="text" class="ant-input" style="width: 50%;"><span class="ant-calendar-picker" style="width: 50%;"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><i aria-label="icon: calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></i></div></span></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Option1-1" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
+</div><input type="text" class="ant-input" style="width: 50%;"></span> <br> <span class="ant-input-group ant-input-group-compact"><input type="text" class="ant-input" style="width: 50%;"><span class="ant-calendar-picker" style="width: 50%;"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span role="img" aria-label="calendar" class="anticon anticon-calendar ant-calendar-picker-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></span></div></span></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Option1-1" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Option1-1
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
->>>>>>> origin/master
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div>
 <div tabindex="0" class="ant-select ant-select-enabled">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
     <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-      <div title="Option2-2" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Option2-2</div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-  </div>
-</div></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Between" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Between</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-</div><input placeholder="Minimum" type="text" class="ant-input" style="width: 100px; text-align: center;"><input placeholder="~" type="text" disabled="disabled" class="ant-input ant-input-disabled" style="width: 30px; pointer-events: none; background-color: rgb(255, 255, 255); border-left: 0;"><input placeholder="Maximum" type="text" class="ant-input" style="width: 100px; text-align: center; border-left: 0;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Sign Up" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Sign Up</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-=======
       <div title="Option2-2" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Option2-2
       </div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
+    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
   </div>
 </div></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Between" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Between
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div><input placeholder="Minimum" type="text" class="ant-input" style="width: 100px; text-align: center;"><input placeholder="~" type="text" disabled="disabled" class="ant-input ant-input-disabled" style="width: 30px; pointer-events: none; background-color: rgb(255, 255, 255); border-left: 0;"><input placeholder="Maximum" type="text" class="ant-input" style="width: 100px; text-align: center; border-left: 0;"></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Sign Up" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Sign Up
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
->>>>>>> origin/master
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
 </div>
 <div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
@@ -80,30 +61,19 @@ exports[`renders ./antdv-demo/docs/input/demo/group.md correctly 1`] = `
       </ul>
     </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
   </div>
-<<<<<<< HEAD
-</div></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 30%;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Home" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Home</div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
-</div><span tabindex="0" class="ant-cascader-picker" style="width: 70%;"><input placeholder="Select Address" type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label"></span><span role="img" aria-label="down" class="anticon anticon-down ant-cascader-picker-arrow"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></span></div>
-=======
 </div></span> <br> <span class="ant-input-group ant-input-group-compact"><div tabindex="0" class="ant-select ant-select-enabled" style="width: 30%;"><div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single"><div class="ant-select-selection__rendered"><div title="Home" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Home
-      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span></div>
-</div><span tabindex="0" class="ant-cascader-picker" style="width: 70%;"><input placeholder="Select Address" type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label"></span><i aria-label="icon: down" class="anticon anticon-down ant-cascader-picker-arrow"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-    <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
-  </svg></i></span></span></div>
->>>>>>> origin/master
+      </div></div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></div>
+</div><span tabindex="0" class="ant-cascader-picker" style="width: 70%;"><input placeholder="Select Address" type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label"></span><span role="img" aria-label="down" class="anticon anticon-down ant-cascader-picker-arrow"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span></span></div>
 `;
 
 exports[`renders ./antdv-demo/docs/input/demo/password-input.md correctly 1`] = `<span class="ant-input-affix-wrapper ant-input-password"><input placeholder="input password" type="password" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="eye-invisible" tabindex="-1" class="anticon anticon-eye-invisible ant-input-password-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="eye-invisible" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M942.2 486.2Q889.47 375.11 816.7 305l-50.88 50.88C807.31 395.53 843.45 447.4 874.7 512 791.5 684.2 673.4 766 512 766q-72.67 0-133.87-22.38L323 798.75Q408 838 512 838q288.3 0 430.2-300.3a60.29 60.29 0 000-51.5zm-63.57-320.64L836 122.88a8 8 0 00-11.32 0L715.31 232.2Q624.86 186 512 186q-288.3 0-430.2 300.3a60.3 60.3 0 000 51.5q56.69 119.4 136.5 191.41L112.48 835a8 8 0 000 11.31L155.17 889a8 8 0 0011.31 0l712.15-712.12a8 8 0 000-11.32zM149.3 512C232.6 339.8 350.7 258 512 258c54.54 0 104.13 9.36 149.12 28.39l-70.3 70.3a176 176 0 00-238.13 238.13l-83.42 83.42C223.1 637.49 183.3 582.28 149.3 512zm246.7 0a112.11 112.11 0 01146.2-106.69L401.31 546.2A112 112 0 01396 512z"></path><path d="M508 624c-3.46 0-6.87-.16-10.25-.47l-52.82 52.82a176.09 176.09 0 00227.42-227.42l-52.82 52.82c.31 3.38.47 6.79.47 10.25a111.94 111.94 0 01-112 112z"></path></svg></span></span></span>`;
 
-<<<<<<< HEAD
 exports[`renders ./antdv-demo/docs/input/demo/presuffix.md correctly 1`] = `<div class="components-input-demo-presuffix"><span class="ant-input-affix-wrapper"><span class="ant-input-prefix"><span role="img" aria-label="user" type="user" class="anticon anticon-user"><svg viewBox="64 64 896 896" focusable="false" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M858.5 763.6a374 374 0 00-80.6-119.5 375.63 375.63 0 00-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 00-80.6 119.5A371.7 371.7 0 00136 901.8a8 8 0 008 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 008-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></span></span><input placeholder="Basic usage" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="info-circle" class="anticon anticon-info-circle" style="color: rgba(0, 0, 0, 0.45);"><svg viewBox="64 64 896 896" focusable="false" data-icon="info-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M464 336a48 48 0 1096 0 48 48 0 10-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"></path></svg></span></span></span> <br> <br> <span class="ant-input-affix-wrapper"><span class="ant-input-prefix">￥</span><input type="text" class="ant-input"><span class="ant-input-suffix">RMB</span></span></div>`;
-=======
-exports[`renders ./antdv-demo/docs/input/demo/presuffix.md correctly 1`] = `<div class="components-input-demo-presuffix"><span class="ant-input-affix-wrapper"><span class="ant-input-prefix"><i aria-label="icon: user" class="anticon anticon-user"><svg viewBox="64 64 896 896" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M858.5 763.6a374 374 0 0 0-80.6-119.5 375.63 375.63 0 0 0-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 0 0-80.6 119.5A371.7 371.7 0 0 0 136 901.8a8 8 0 0 0 8 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 0 0 8-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></i></span><input placeholder="Basic usage" type="text" class="ant-input"><span class="ant-input-suffix"><i aria-label="icon: info-circle" class="anticon anticon-info-circle" style="color: rgba(0, 0, 0, 0.45);"><svg viewBox="64 64 896 896" data-icon="info-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M464 336a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"></path></svg></i></span></span> <br> <br> <span class="ant-input-affix-wrapper"><span class="ant-input-prefix">￥</span><input type="text" class="ant-input"><span class="ant-input-suffix">RMB</span></span></div>`;
->>>>>>> origin/master
 
-exports[`renders ./antdv-demo/docs/input/demo/search-input.md correctly 1`] = `<div><span class="ant-input-affix-wrapper ant-input-search" style="width: 200px;"><input placeholder="input search text" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span> <br><br> <span class="ant-input-group-wrapper ant-input-search ant-input-search-enter-button"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-input-search-button"><span role="img" aria-label="search" class="anticon anticon-search"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></button></span></span></span> <br><br> <span class="ant-input-group-wrapper ant-input-group-wrapper-lg ant-input-search ant-input-search-enter-button ant-input-search-large"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input ant-input-lg"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-btn-lg ant-input-search-button"><span>Search</span></button></span></span></span> <br><br> <span class="ant-input-group-wrapper ant-input-group-wrapper-lg ant-input-search ant-input-search-enter-button ant-input-search-large"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input ant-input-lg"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-lg ant-input-search-button"><span>Custom</span></button></span></span></span></div>`;
+exports[`renders ./antdv-demo/docs/input/demo/search-input.md correctly 1`] = `<div><span class="ant-input-search ant-input-affix-wrapper" style="width: 200px;"><input placeholder="input search text" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span> <br><br> <span class="ant-input-search ant-input-search-enter-button ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-input-search-button"><span role="img" aria-label="search" class="anticon anticon-search"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></button></span></span></span> <br><br> <span class="ant-input-search ant-input-search-enter-button ant-input-search-large ant-input-group-wrapper ant-input-group-wrapper-lg"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input ant-input-lg"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-btn-lg ant-input-search-button"><span>Search</span></button></span></span></span> <br><br> <span class="ant-input-search ant-input-search-enter-button ant-input-search-large ant-input-group-wrapper ant-input-group-wrapper-lg"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search text" type="text" class="ant-input ant-input-lg"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-lg ant-input-search-button"><span>Custom</span></button></span></span></span></div>`;
 
-exports[`renders ./antdv-demo/docs/input/demo/search-input-loading.md correctly 1`] = `<div><span class="ant-input-affix-wrapper ant-input-search"><input placeholder="input search loading deault" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="loading" class="anticon anticon-loading ant-input-search-icon"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></span></span> <br> <br> <span class="ant-input-group-wrapper ant-input-search ant-input-search-enter-button"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search loading with enterButton" type="text" class="ant-input"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-input-search-button"><span role="img" aria-label="loading" class="anticon anticon-loading"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></button></span></span></span></div>`;
+exports[`renders ./antdv-demo/docs/input/demo/search-input-loading.md correctly 1`] = `<div><span class="ant-input-search ant-input-affix-wrapper"><input placeholder="input search loading deault" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="loading" class="anticon anticon-loading ant-input-search-icon"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></span></span> <br> <br> <span class="ant-input-search ant-input-search-enter-button ant-input-group-wrapper"><span class="ant-input-wrapper ant-input-group"><input placeholder="input search loading with enterButton" type="text" class="ant-input"><span class="ant-input-group-addon"><button type="button" class="ant-btn ant-btn-primary ant-input-search-button"><span role="img" aria-label="loading" class="anticon anticon-loading"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></button></span></span></span></div>`;
 
 exports[`renders ./antdv-demo/docs/input/demo/size.md correctly 1`] = `<div class="components-input-demo-size"><input placeholder="large size" type="text" class="ant-input ant-input-lg"> <input placeholder="default size" type="text" class="ant-input"> <input placeholder="small size" type="text" class="ant-input ant-input-sm"></div>`;
 
diff --git a/components/input/__tests__/__snapshots__/index.test.js.snap b/components/input/__tests__/__snapshots__/index.test.js.snap
index 0a81940c8..afffd245f 100644
--- a/components/input/__tests__/__snapshots__/index.test.js.snap
+++ b/components/input/__tests__/__snapshots__/index.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Input should support maxLength 1`] = `<input type="text" maxlength="3" class="ant-input">`;
 
-exports[`Input.Search should support suffix 1`] = `<span class="ant-input-affix-wrapper ant-input-search"><input type="text" class="ant-input"><span class="ant-input-suffix">suffix<span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span>`;
+exports[`Input.Search should support suffix 1`] = `<span class="ant-input-search ant-input-affix-wrapper"><input type="text" class="ant-input"><span class="ant-input-suffix">suffix<span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span>`;
 
 exports[`TextArea should support disabled 1`] = `<textarea disabled="disabled" class="ant-input ant-input-disabled"></textarea>`;
 
diff --git a/components/layout/__tests__/__snapshots__/demo.test.js.snap b/components/layout/__tests__/__snapshots__/demo.test.js.snap
index cadd16e9a..4505e3dab 100644
--- a/components/layout/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/layout/__tests__/__snapshots__/demo.test.js.snap
@@ -284,18 +284,10 @@ exports[`renders ./antdv-demo/docs/layout/demo/top-side.md correctly 1`] = `
             <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected">
               <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="user" class="anticon anticon-user"><svg viewBox="64 64 896 896" focusable="false" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M858.5 763.6a374 374 0 00-80.6-119.5 375.63 375.63 0 00-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 00-80.6 119.5A371.7 371.7 0 00136 901.8a8 8 0 008 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 008-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></span>subnav 1</span><i class="ant-menu-submenu-arrow"></i></div>
               <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-                <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">
-                  option1
-                </li>
-                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                  option2
-                </li>
-                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                  option3
-                </li>
-                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                  option4
-                </li>
+                <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">option1</li>
+                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option2</li>
+                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option3</li>
+                <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option4</li>
               </ul>
             </li>
             <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
@@ -355,18 +347,10 @@ exports[`renders ./antdv-demo/docs/layout/demo/top-side-2.md correctly 1`] = `
           <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected">
             <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="user" class="anticon anticon-user"><svg viewBox="64 64 896 896" focusable="false" data-icon="user" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M858.5 763.6a374 374 0 00-80.6-119.5 375.63 375.63 0 00-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 00-80.6 119.5A371.7 371.7 0 00136 901.8a8 8 0 008 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 008-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"></path></svg></span>subnav 1</span><i class="ant-menu-submenu-arrow"></i></div>
             <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-              <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">
-                option1
-              </li>
-              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                option2
-              </li>
-              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                option3
-              </li>
-              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-                option4
-              </li>
+              <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">option1</li>
+              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option2</li>
+              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option3</li>
+              <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">option4</li>
             </ul>
           </li>
           <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
index 13c08b924..e079ab6a8 100644
--- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -954,11 +954,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -1382,11 +1378,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -1810,11 +1802,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -2238,11 +2226,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -2666,11 +2650,7 @@ exports[`Locale Provider should display the text as da 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -3094,11 +3074,7 @@ exports[`Locale Provider should display the text as de 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -3522,11 +3498,7 @@ exports[`Locale Provider should display the text as el 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -3950,11 +3922,7 @@ exports[`Locale Provider should display the text as en 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -4378,11 +4346,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -4806,11 +4770,7 @@ exports[`Locale Provider should display the text as es 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -5234,11 +5194,7 @@ exports[`Locale Provider should display the text as et 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -5662,11 +5618,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -6090,11 +6042,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -6518,11 +6466,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -6946,11 +6890,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -7374,11 +7314,7 @@ exports[`Locale Provider should display the text as he 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -7802,11 +7738,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -7895,305 +7827,12 @@ exports[`Locale Provider should display the text as hr 1`] = `
           <div title="2017" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">2017</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
       </div>
-<<<<<<< HEAD
     </div>
     <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
       <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
         <div class="ant-select-selection__rendered">
           <div title="ruj." class="ant-select-selection-selected-value" style="display: block; opacity: 1;">ruj.</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
-      <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
-        <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-          <div class="ant-select-selection__rendered">
-            <div title="ruj." class="ant-select-selection-selected-value" style="display: block; opacity: 1;">ruj.</div>
-          </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="ikona: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
-        </div>
-      </div>
-      <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mjesec</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Godina</span></label></div>
-    </div>
-    <div tabindex="0" class="ant-fullcalendar ant-fullcalendar-full">
-      <div class="ant-fullcalendar-calendar-body">
-        <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
-          <thead>
-            <tr role="row">
-              <th role="columnheader" title="pon." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">po</span></th>
-              <th role="columnheader" title="uto." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">ut</span></th>
-              <th role="columnheader" title="sri." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">sr</span></th>
-              <th role="columnheader" title="čet." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">če</span></th>
-              <th role="columnheader" title="pet." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">pe</span></th>
-              <th role="columnheader" title="sub." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">su</span></th>
-              <th role="columnheader" title="ned." class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">ne</span></th>
-            </tr>
-          </thead>
-          <tbody class="ant-fullcalendar-tbody">
-            <tr role="row" class="">
-              <td role="gridcell" title="28. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="31. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">31</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="4. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="9. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">09</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="10. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">10</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="11. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">11</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="12. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">12</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="13. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">13</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="14. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">14</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="15. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">15</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="16. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">16</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="17. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">17</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-              <td role="gridcell" title="18. rujna 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">18</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="19. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">19</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="20. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">20</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="21. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">21</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="22. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">22</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="23. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">23</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="24. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">24</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="25. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">25</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="26. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">26</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="27. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29. rujna 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30. rujna 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="2. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
->>>>>>> origin/master
       </div>
     </div>
     <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mjesec</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Godina</span></label></div>
@@ -8214,43 +7853,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
         </thead>
         <tbody class="ant-fullcalendar-tbody">
           <tr role="row" class="">
-            <td role="gridcell" title="28. kolovoz 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="28. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29. kolovoz 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="29. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30. kolovoz 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="30. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="31. kolovoz 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="31. kolovoza 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">31</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="1. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="1. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="2. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="2. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="3. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="3. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8258,43 +7897,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="4. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="4. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="5. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="6. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="7. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="8. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">08</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="9. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="9. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">09</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="10. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="10. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">10</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8302,43 +7941,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="11. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="11. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">11</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="12. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="12. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">12</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="13. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="13. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">13</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="14. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="14. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">14</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="15. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="15. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">15</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="16. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="16. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">16</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="17. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="17. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">17</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8346,43 +7985,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
             </td>
           </tr>
           <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-            <td role="gridcell" title="18. rujan 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
+            <td role="gridcell" title="18. rujna 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">18</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="19. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="19. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">19</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="20. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="20. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">20</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="21. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="21. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">21</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="22. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="22. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">22</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="23. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="23. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">23</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="24. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="24. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">24</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8390,43 +8029,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="25. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="25. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">25</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="26. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="26. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">26</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="27. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="27. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">27</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="28. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="28. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29. rujan 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="29. rujna 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30. rujan 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="30. rujna 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="1. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="1. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8434,43 +8073,43 @@ exports[`Locale Provider should display the text as hr 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="2. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="2. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="3. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="3. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="4. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="4. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="5. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="6. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="7. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8. listopad 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="8. listopada 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">08</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -8523,11 +8162,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -8951,11 +8586,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -9379,11 +9010,7 @@ exports[`Locale Provider should display the text as hy 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -9472,305 +9099,12 @@ exports[`Locale Provider should display the text as id 1`] = `
           <div title="2017" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">2017</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
       </div>
-<<<<<<< HEAD
     </div>
     <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
       <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
         <div class="ant-select-selection__rendered">
           <div title="Sep" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Sep</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
-      <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
-        <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-          <div class="ant-select-selection__rendered">
-            <div title="Sep" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Sep</div>
-          </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
-        </div>
-      </div>
-      <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Bulan</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Tahun</span></label></div>
-    </div>
-    <div tabindex="0" class="ant-fullcalendar ant-fullcalendar-full">
-      <div class="ant-fullcalendar-calendar-body">
-        <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
-          <thead>
-            <tr role="row">
-              <th role="columnheader" title="Min" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Mg</span></th>
-              <th role="columnheader" title="Sen" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sn</span></th>
-              <th role="columnheader" title="Sel" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sl</span></th>
-              <th role="columnheader" title="Rab" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Rb</span></th>
-              <th role="columnheader" title="Kam" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Km</span></th>
-              <th role="columnheader" title="Jum" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Jm</span></th>
-              <th role="columnheader" title="Sab" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sb</span></th>
-            </tr>
-          </thead>
-          <tbody class="ant-fullcalendar-tbody">
-            <tr role="row" class="">
-              <td role="gridcell" title="27 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="31 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">31</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="3 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="9 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">09</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="10 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">10</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="11 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">11</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="12 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">12</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="13 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">13</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="14 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">14</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="15 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">15</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="16 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">16</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-              <td role="gridcell" title="17 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">17</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="18 September 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">18</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="19 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">19</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="20 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">20</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="21 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">21</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="22 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">22</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="23 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">23</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="24 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">24</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="25 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">25</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="26 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">26</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="27 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 September 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 September 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="1 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
->>>>>>> origin/master
       </div>
     </div>
     <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Bulan</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Tahun</span></label></div>
@@ -9780,17 +9114,23 @@ exports[`Locale Provider should display the text as id 1`] = `
       <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
         <thead>
           <tr role="row">
+            <th role="columnheader" title="Min" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Mg</span></th>
             <th role="columnheader" title="Sen" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sn</span></th>
             <th role="columnheader" title="Sel" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sl</span></th>
             <th role="columnheader" title="Rab" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Rb</span></th>
             <th role="columnheader" title="Kam" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Km</span></th>
             <th role="columnheader" title="Jum" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Jm</span></th>
             <th role="columnheader" title="Sab" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sb</span></th>
-            <th role="columnheader" title="Min" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Mg</span></th>
           </tr>
         </thead>
         <tbody class="ant-fullcalendar-tbody">
           <tr role="row" class="">
+            <td role="gridcell" title="27 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+              <div class="ant-fullcalendar-date">
+                <div class="ant-fullcalendar-value">27</div>
+                <div class="ant-fullcalendar-content"></div>
+              </div>
+            </td>
             <td role="gridcell" title="28 Agustus 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
@@ -9827,14 +9167,14 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
+          </tr>
+          <tr role="row" class="">
             <td role="gridcell" title="3 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-          </tr>
-          <tr role="row" class="">
             <td role="gridcell" title="4 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
@@ -9871,14 +9211,14 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
+          </tr>
+          <tr role="row" class="">
             <td role="gridcell" title="10 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">10</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-          </tr>
-          <tr role="row" class="">
             <td role="gridcell" title="11 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">11</div>
@@ -9915,14 +9255,14 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
+          </tr>
+          <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
             <td role="gridcell" title="17 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">17</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-          </tr>
-          <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
             <td role="gridcell" title="18 September 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">18</div>
@@ -9959,14 +9299,14 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
+          </tr>
+          <tr role="row" class="">
             <td role="gridcell" title="24 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">24</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-          </tr>
-          <tr role="row" class="">
             <td role="gridcell" title="25 September 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">25</div>
@@ -10003,14 +9343,14 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
+          </tr>
+          <tr role="row" class="">
             <td role="gridcell" title="1 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-          </tr>
-          <tr role="row" class="">
             <td role="gridcell" title="2 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
@@ -10047,12 +9387,6 @@ exports[`Locale Provider should display the text as id 1`] = `
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8 Oktober 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-              <div class="ant-fullcalendar-date">
-                <div class="ant-fullcalendar-value">08</div>
-                <div class="ant-fullcalendar-content"></div>
-              </div>
-            </td>
           </tr>
         </tbody>
       </table>
@@ -10100,11 +9434,7 @@ exports[`Locale Provider should display the text as id 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -10528,11 +9858,7 @@ exports[`Locale Provider should display the text as is 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -10956,11 +10282,7 @@ exports[`Locale Provider should display the text as it 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -11384,11 +10706,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -11812,11 +11130,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -12240,11 +11554,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -12668,11 +11978,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -13096,11 +12402,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -13524,11 +12826,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -13952,11 +13250,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -14380,11 +13674,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -14808,11 +14098,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -15236,11 +14522,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -15664,11 +14946,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -16092,11 +15370,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -16520,11 +15794,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -16613,305 +15883,12 @@ exports[`Locale Provider should display the text as pt 1`] = `
           <div title="2017" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">2017</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
       </div>
-<<<<<<< HEAD
     </div>
     <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
       <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
         <div class="ant-select-selection__rendered">
-          <div title="Set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Set</div>
+          <div title="set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">set</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
-      <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
-        <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-          <div class="ant-select-selection__rendered">
-            <div title="set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">set</div>
-          </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
-        </div>
-      </div>
-      <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mês</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Ano</span></label></div>
-    </div>
-    <div tabindex="0" class="ant-fullcalendar ant-fullcalendar-full">
-      <div class="ant-fullcalendar-calendar-body">
-        <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
-          <thead>
-            <tr role="row">
-              <th role="columnheader" title="Seg" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">2ª</span></th>
-              <th role="columnheader" title="Ter" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">3ª</span></th>
-              <th role="columnheader" title="Qua" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">4ª</span></th>
-              <th role="columnheader" title="Qui" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">5ª</span></th>
-              <th role="columnheader" title="Sex" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">6ª</span></th>
-              <th role="columnheader" title="Sáb" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sá</span></th>
-              <th role="columnheader" title="Dom" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Do</span></th>
-            </tr>
-          </thead>
-          <tbody class="ant-fullcalendar-tbody">
-            <tr role="row" class="">
-              <td role="gridcell" title="28 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="31 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">31</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="4 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="9 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">09</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="10 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">10</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="11 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">11</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="12 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">12</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="13 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">13</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="14 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">14</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="15 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">15</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="16 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">16</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="17 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">17</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-              <td role="gridcell" title="18 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">18</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="19 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">19</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="20 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">20</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="21 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">21</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="22 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">22</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="23 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">23</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="24 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">24</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="25 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">25</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="26 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">26</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="27 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="2 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
->>>>>>> origin/master
       </div>
     </div>
     <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mês</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Ano</span></label></div>
@@ -16932,43 +15909,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
         </thead>
         <tbody class="ant-fullcalendar-tbody">
           <tr role="row" class="">
-            <td role="gridcell" title="28 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="28 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="29 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="30 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="31 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="31 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">31</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="1 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="1 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="2 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="2 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="3 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="3 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -16976,43 +15953,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="4 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="4 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="5 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="6 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="7 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="8 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">08</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="9 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="9 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">09</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="10 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="10 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">10</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17020,43 +15997,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="11 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="11 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">11</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="12 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="12 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">12</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="13 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="13 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">13</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="14 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="14 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">14</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="15 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="15 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">15</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="16 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="16 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">16</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="17 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="17 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">17</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17064,43 +16041,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
             </td>
           </tr>
           <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-            <td role="gridcell" title="18 de Setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
+            <td role="gridcell" title="18 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">18</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="19 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="19 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">19</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="20 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="20 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">20</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="21 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="21 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">21</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="22 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="22 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">22</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="23 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="23 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">23</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="24 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="24 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">24</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17108,43 +16085,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="25 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="25 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">25</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="26 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="26 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">26</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="27 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="27 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">27</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="28 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="28 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="29 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30 de Setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="30 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="1 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="1 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17152,43 +16129,43 @@ exports[`Locale Provider should display the text as pt 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="2 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="2 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="3 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="3 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="4 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="4 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="5 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="6 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="7 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="8 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">08</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17241,11 +16218,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -17334,305 +16307,12 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
           <div title="2017" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">2017</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
       </div>
-<<<<<<< HEAD
     </div>
     <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
       <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
         <div class="ant-select-selection__rendered">
-          <div title="Set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Set</div>
+          <div title="set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">set</div>
         </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
-      <div tabindex="0" class="ant-select ant-select-enabled ant-select-sm ant-fullcalendar-month-select">
-        <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
-          <div class="ant-select-selection__rendered">
-            <div title="set" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">set</div>
-          </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
-        </div>
-      </div>
-      <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mês</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Ano</span></label></div>
-    </div>
-    <div tabindex="0" class="ant-fullcalendar ant-fullcalendar-full">
-      <div class="ant-fullcalendar-calendar-body">
-        <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
-          <thead>
-            <tr role="row">
-              <th role="columnheader" title="dom" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">do</span></th>
-              <th role="columnheader" title="seg" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">2ª</span></th>
-              <th role="columnheader" title="ter" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">3ª</span></th>
-              <th role="columnheader" title="qua" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">4ª</span></th>
-              <th role="columnheader" title="qui" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">5ª</span></th>
-              <th role="columnheader" title="sex" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">6ª</span></th>
-              <th role="columnheader" title="sáb" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">sá</span></th>
-            </tr>
-          </thead>
-          <tbody class="ant-fullcalendar-tbody">
-            <tr role="row" class="">
-              <td role="gridcell" title="27 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="31 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">31</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="1 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="3 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="8 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">08</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="9 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">09</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="10 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">10</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="11 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">11</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="12 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">12</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="13 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">13</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="14 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">14</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="15 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">15</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="16 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">16</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-              <td role="gridcell" title="17 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">17</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="18 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">18</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="19 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">19</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="20 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">20</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="21 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">21</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="22 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">22</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="23 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">23</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="24 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">24</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="25 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">25</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="26 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">26</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="27 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">27</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="28 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">28</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="29 de setembro de 2017" class="ant-fullcalendar-cell">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">29</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="30 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">30</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-            <tr role="row" class="">
-              <td role="gridcell" title="1 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">01</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="2 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">02</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="3 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">03</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="4 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">04</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="5 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">05</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="6 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">06</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-              <td role="gridcell" title="7 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
-                <div class="ant-fullcalendar-date">
-                  <div class="ant-fullcalendar-value">07</div>
-                  <div class="ant-fullcalendar-content"></div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
->>>>>>> origin/master
       </div>
     </div>
     <div class="ant-radio-group ant-radio-group-outline ant-radio-group-small"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="month"><span class="ant-radio-button-inner"></span></span><span>Mês</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="year"><span class="ant-radio-button-inner"></span></span><span>Ano</span></label></div>
@@ -17642,54 +16322,54 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
       <table cellspacing="0" role="grid" class="ant-fullcalendar-table">
         <thead>
           <tr role="row">
-            <th role="columnheader" title="Dom" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Do</span></th>
-            <th role="columnheader" title="Seg" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">2ª</span></th>
-            <th role="columnheader" title="Ter" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">3ª</span></th>
-            <th role="columnheader" title="Qua" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">4ª</span></th>
-            <th role="columnheader" title="Qui" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">5ª</span></th>
-            <th role="columnheader" title="Sex" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">6ª</span></th>
-            <th role="columnheader" title="Sáb" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">Sá</span></th>
+            <th role="columnheader" title="dom" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">do</span></th>
+            <th role="columnheader" title="seg" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">2ª</span></th>
+            <th role="columnheader" title="ter" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">3ª</span></th>
+            <th role="columnheader" title="qua" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">4ª</span></th>
+            <th role="columnheader" title="qui" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">5ª</span></th>
+            <th role="columnheader" title="sex" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">6ª</span></th>
+            <th role="columnheader" title="sáb" class="ant-fullcalendar-column-header"><span class="ant-fullcalendar-column-header-inner">sá</span></th>
           </tr>
         </thead>
         <tbody class="ant-fullcalendar-tbody">
           <tr role="row" class="">
-            <td role="gridcell" title="27 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="27 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">27</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="28 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="28 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="29 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
+            <td role="gridcell" title="30 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="31 de Agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="31 de agosto de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-month-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">31</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="1 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="1 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="2 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="2 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17697,43 +16377,43 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="3 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="3 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="4 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="4 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="5 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="6 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="7 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="8 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="8 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">08</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="9 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="9 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">09</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17741,43 +16421,43 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="10 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="10 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">10</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="11 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="11 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">11</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="12 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="12 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">12</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="13 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="13 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">13</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="14 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="14 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">14</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="15 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="15 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">15</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="16 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="16 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">16</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17785,43 +16465,43 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             </td>
           </tr>
           <tr role="row" class="ant-fullcalendar-current-week ant-fullcalendar-active-week">
-            <td role="gridcell" title="17 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="17 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">17</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="18 de Setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
+            <td role="gridcell" title="18 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-today ant-fullcalendar-selected-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">18</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="19 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="19 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">19</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="20 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="20 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">20</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="21 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="21 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">21</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="22 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="22 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">22</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="23 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="23 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">23</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17829,43 +16509,43 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="24 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="24 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">24</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="25 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="25 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">25</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="26 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="26 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">26</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="27 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="27 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">27</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="28 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="28 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">28</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="29 de Setembro de 2017" class="ant-fullcalendar-cell">
+            <td role="gridcell" title="29 de setembro de 2017" class="ant-fullcalendar-cell">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">29</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="30 de Setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
+            <td role="gridcell" title="30 de setembro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-last-day-of-month">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">30</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17873,43 +16553,43 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             </td>
           </tr>
           <tr role="row" class="">
-            <td role="gridcell" title="1 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="1 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">01</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="2 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="2 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">02</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="3 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="3 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">03</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="4 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="4 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">04</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="5 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="5 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">05</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="6 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="6 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">06</div>
                 <div class="ant-fullcalendar-content"></div>
               </div>
             </td>
-            <td role="gridcell" title="7 de Outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
+            <td role="gridcell" title="7 de outubro de 2017" class="ant-fullcalendar-cell ant-fullcalendar-next-month-btn-day">
               <div class="ant-fullcalendar-date">
                 <div class="ant-fullcalendar-value">07</div>
                 <div class="ant-fullcalendar-content"></div>
@@ -17962,11 +16642,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -18390,11 +17066,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -18818,11 +17490,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -19246,11 +17914,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -19674,11 +18338,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -20102,11 +18762,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -20530,11 +19186,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -20958,11 +19610,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -21386,11 +20034,7 @@ exports[`Locale Provider should display the text as th 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -21814,11 +20458,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -22242,11 +20882,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -22670,11 +21306,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -23098,11 +21730,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
 
@@ -23526,10 +22154,6 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
   </div>
 </div>
 </div>
-<<<<<<< HEAD
 </div>
-<!---->
-=======
->>>>>>> origin/master
 </div>
 `;
diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap
index c8d579994..ba02bee39 100644
--- a/components/menu/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap
@@ -39,12 +39,8 @@ exports[`renders ./antdv-demo/docs/menu/demo/inline.md correctly 1`] = `
         <li class="ant-menu-item-group">
           <div class="ant-menu-item-group-title"><span role="img" aria-label="qq" class="anticon anticon-qq"><svg viewBox="64 64 896 896" focusable="false" data-icon="qq" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M824.8 613.2c-16-51.4-34.4-94.6-62.7-165.3C766.5 262.2 689.3 112 511.5 112 331.7 112 256.2 265.2 261 447.9c-28.4 70.8-46.7 113.7-62.7 165.3-34 109.5-23 154.8-14.6 155.8 18 2.2 70.1-82.4 70.1-82.4 0 49 25.2 112.9 79.8 159-26.4 8.1-85.7 29.9-71.6 53.8 11.4 19.3 196.2 12.3 249.5 6.3 53.3 6 238.1 13 249.5-6.3 14.1-23.8-45.3-45.7-71.6-53.8 54.6-46.2 79.8-110.1 79.8-159 0 0 52.1 84.6 70.1 82.4 8.5-1.1 19.5-46.4-14.5-155.8z"></path></svg></span><span>Item 1</span></div>
           <ul class="ant-menu-item-group-list">
-            <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">
-              Option 1
-            </li>
-            <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-              Option 2
-            </li>
+            <li role="menuitem" class="ant-menu-item ant-menu-item-selected" style="padding-left: 48px;">Option 1</li>
+            <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 2</li>
           </ul>
         </li>
         <li class="ant-menu-item-group">
@@ -81,22 +77,19 @@ exports[`renders ./antdv-demo/docs/menu/demo/inline-collapsed.md correctly 1`] =
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open">
       <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="mail" class="anticon anticon-mail"><svg viewBox="64 64 896 896" focusable="false" data-icon="mail" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M928 160H96c-17.7 0-32 14.3-32 32v640c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V192c0-17.7-14.3-32-32-32zm-40 110.8V792H136V270.8l-27.6-21.5 39.3-50.5 42.8 33.3h643.1l42.8-33.3 39.3 50.5-27.7 21.5zM833.6 232L512 482 190.4 232l-42.8-33.3-39.3 50.5 27.6 21.5 341.6 265.6a55.99 55.99 0 0068.7 0L888 270.8l27.6-21.5-39.3-50.5-42.7 33.2z"></path></svg></span><span>Navigation One</span></span><i class="ant-menu-submenu-arrow"></i></div>
       <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 5
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 6
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 7
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 8
-        </li>
+        &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 5</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 6</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 7</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 8</li>
       </ul>
     </li>
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
-      <div aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="appstore" class="anticon anticon-appstore"><svg viewBox="64 64 896 896" focusable="false" data-icon="appstore" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"></path></svg></span><span>Navigation Two</span></span><i class="ant-menu-submenu-arrow"></i></div>
+      <div aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="appstore" class="anticon anticon-appstore"><svg viewBox="64 64 896 896" focusable="false" data-icon="appstore" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"></path></svg></span><span>Navigation Two</span></span><span><!----><span>Navigation One</span></span><i class="ant-menu-submenu-arrow"></i></div>
+      <div></div>
+    </li>
+    <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
+      <div aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><!----><span>Navigation Two</span></span><i class="ant-menu-submenu-arrow"></i></div>
       <div></div>
     </li>
   </ul>
@@ -109,18 +102,10 @@ exports[`renders ./antdv-demo/docs/menu/demo/sider-current.md correctly 1`] = `
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open">
       <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="mail" class="anticon anticon-mail"><svg viewBox="64 64 896 896" focusable="false" data-icon="mail" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M928 160H96c-17.7 0-32 14.3-32 32v640c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V192c0-17.7-14.3-32-32-32zm-40 110.8V792H136V270.8l-27.6-21.5 39.3-50.5 42.8 33.3h643.1l42.8-33.3 39.3 50.5-27.7 21.5zM833.6 232L512 482 190.4 232l-42.8-33.3-39.3 50.5 27.6 21.5 341.6 265.6a55.99 55.99 0 0068.7 0L888 270.8l27.6-21.5-39.3-50.5-42.7 33.2z"></path></svg></span><span>Navigation One</span></span><i class="ant-menu-submenu-arrow"></i></div>
       <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 1
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 2
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 3
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 4
-        </li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 1</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 2</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 3</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 4</li>
       </ul>
     </li>
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
@@ -149,12 +134,8 @@ exports[`renders ./antdv-demo/docs/menu/demo/switch-mode.md correctly 1`] = `
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open">
       <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="appstore" class="anticon anticon-appstore"><svg viewBox="64 64 896 896" focusable="false" data-icon="appstore" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"></path></svg></span><span>Navigation Three</span></span><i class="ant-menu-submenu-arrow"></i></div>
       <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 3
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 4
-        </li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 3</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 4</li>
         <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
           <div aria-haspopup="true" title="Submenu" class="ant-menu-submenu-title" style="padding-left: 48px;">Submenu<i class="ant-menu-submenu-arrow"></i></div>
           <div></div>
@@ -198,12 +179,8 @@ exports[`renders ./antdv-demo/docs/menu/demo/theme.md correctly 1`] = `
     <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open">
       <div aria-expanded="true" aria-owns="sub1$Menu" aria-haspopup="true" class="ant-menu-submenu-title" style="padding-left: 24px;"><span><span role="img" aria-label="appstore" class="anticon anticon-appstore"><svg viewBox="64 64 896 896" focusable="false" data-icon="appstore" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H212V212h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16zm-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H212V612h200v200zm452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16zm-52 268H612V612h200v200z"></path></svg></span><span>Navigation Three</span></span><i class="ant-menu-submenu-arrow"></i></div>
       <ul role="menu" class="ant-menu ant-menu-inline  ant-menu-sub">
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 3
-        </li>
-        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">
-          Option 4
-        </li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 3</li>
+        <li role="menuitem" class="ant-menu-item" style="padding-left: 48px;">Option 4</li>
         <li role="menuitem" class="ant-menu-submenu ant-menu-submenu-inline">
           <div aria-haspopup="true" title="Submenu" class="ant-menu-submenu-title" style="padding-left: 48px;">Submenu<i class="ant-menu-submenu-arrow"></i></div>
           <div></div>
diff --git a/components/select/__tests__/__snapshots__/demo.test.js.snap b/components/select/__tests__/__snapshots__/demo.test.js.snap
index ece725259..fd44372e9 100644
--- a/components/select/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/select/__tests__/__snapshots__/demo.test.js.snap
@@ -19,43 +19,28 @@ exports[`renders ./antdv-demo/docs/select/demo/basic.md correctly 1`] = `
   <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
         <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Lucy
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
     </div>
   </div>
   <div tabindex="-1" class="ant-select ant-select-disabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
         <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Lucy
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
     </div>
   </div>
   <div tabindex="0" class="ant-select ant-select-enabled ant-select-loading" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="loading" class="anticon anticon-loading"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></span>
-=======
         <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Lucy
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: loading" class="anticon anticon-loading"><svg viewBox="0 0 1024 1024" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 0 0-94.3-139.9 437.71 437.71 0 0 0-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="loading" class="anticon anticon-loading"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="loading" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="anticon-spin"><path d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"></path></svg></span></span>
     </div>
   </div>
 </div>
@@ -66,29 +51,19 @@ exports[`renders ./antdv-demo/docs/select/demo/coordinate.md correctly 1`] = `
   <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="Zhejiang" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Zhejiang</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
         <div title="Zhejiang" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Zhejiang
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
     </div>
   </div>
   <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-        <div title="Hangzhou" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Hangzhou</div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
         <div title="Hangzhou" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
           Hangzhou
         </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
     </div>
   </div>
 </div>
@@ -98,15 +73,10 @@ exports[`renders ./antdv-demo/docs/select/demo/custom-dropdown-menu.md correctly
 <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
     <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-      <div title="lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">lucy</div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
       <div title="lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         lucy
       </div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
   </div>
 </div>
 `;
@@ -130,15 +100,10 @@ exports[`renders ./antdv-demo/docs/select/demo/label-in-value.md correctly 1`] =
 <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
     <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
-      <div title="Lucy (101)" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy (101)</div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
       <div title="Lucy (101)" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
         Lucy (101)
       </div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
+    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
   </div>
 </div>
 `;
@@ -150,21 +115,14 @@ exports[`renders ./antdv-demo/docs/select/demo/multiple.md correctly 1`] = `
       <div unselectable="on" class="ant-select-selection__placeholder" style="display: none; user-select: none;">Please select</div>
       <div>
         <li unselectable="on" role="presentation" title="a1" class="ant-select-selection__choice" style="user-select: none;">
-<<<<<<< HEAD
-          <div class="ant-select-selection__choice__content">a1</div><span class="ant-select-selection__choice__remove"><span role="img" aria-label="close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span>
-        </li>
-        <li unselectable="on" role="presentation" title="b2" class="ant-select-selection__choice" style="user-select: none;">
-          <div class="ant-select-selection__choice__content">b2</div><span class="ant-select-selection__choice__remove"><span role="img" aria-label="close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span>
-=======
           <div class="ant-select-selection__choice__content">
             a1
-          </div><span class="ant-select-selection__choice__remove"><i aria-label="icon: close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></i></span>
+          </div><span class="ant-select-selection__choice__remove"><span role="img" aria-label="close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span>
         </li>
         <li unselectable="on" role="presentation" title="b2" class="ant-select-selection__choice" style="user-select: none;">
           <div class="ant-select-selection__choice__content">
             b2
-          </div><span class="ant-select-selection__choice__remove"><i aria-label="icon: close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></i></span>
->>>>>>> origin/master
+          </div><span class="ant-select-selection__choice__remove"><span role="img" aria-label="close" class="anticon anticon-close ant-select-remove-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span>
         </li>
         <li class="ant-select-search ant-select-search--inline">
           <div class="ant-select-search__field__wrap"><input autocomplete="off" value="" class="ant-select-search__field"><span class="ant-select-search__field__mirror">&nbsp;</span></div>
@@ -179,15 +137,8 @@ exports[`renders ./antdv-demo/docs/select/demo/optgroup.md correctly 1`] = `
 <div tabindex="0" class="ant-select ant-select-enabled" style="width: 200px;">
   <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
     <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
       <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
     </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></span></span>
-=======
-      <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
-        Lucy
-      </div>
-    </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: down" class="anticon anticon-down ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path></svg></i></span>
->>>>>>> origin/master
   </div>
 </div>
 `;
@@ -331,29 +282,15 @@ exports[`renders ./antdv-demo/docs/select/demo/suffix.md correctly 1`] = `
   <div tabindex="0" class="ant-select ant-select-enabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
         <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
       </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="smile" class="anticon anticon-smile ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="smile" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"></path></svg></span></span>
-=======
-        <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
-          Lucy
-        </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: smile" class="anticon anticon-smile ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="smile" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"></path></svg></i></span>
->>>>>>> origin/master
     </div>
   </div>
   <div tabindex="-1" class="ant-select ant-select-disabled" style="width: 120px;">
     <div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
       <div class="ant-select-selection__rendered">
-<<<<<<< HEAD
         <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">Lucy</div>
       </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><span role="img" aria-label="meh" class="anticon anticon-meh ant-select-arrow-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="meh" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 565H360c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h304c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"></path></svg></span></span>
-=======
-        <div title="Lucy" class="ant-select-selection-selected-value" style="display: block; opacity: 1;">
-          Lucy
-        </div>
-      </div><span unselectable="on" class="ant-select-arrow" style="user-select: none;"><i aria-label="icon: meh" class="anticon anticon-meh ant-select-arrow-icon"><svg viewBox="64 64 896 896" data-icon="meh" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 565H360c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h304c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"></path></svg></i></span>
->>>>>>> origin/master
     </div>
   </div>
 </div>
diff --git a/components/slider/__tests__/__snapshots__/demo.test.js.snap b/components/slider/__tests__/__snapshots__/demo.test.js.snap
index 2d123b419..576e5bfa9 100644
--- a/components/slider/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/slider/__tests__/__snapshots__/demo.test.js.snap
@@ -56,7 +56,8 @@ exports[`renders ./antdv-demo/docs/slider/demo/icon-slider.md correctly 1`] = `
     <div class="ant-slider-step"></div>
     <div role="slider" tabindex="0" aria-valuemin="0" aria-valuemax="20" aria-valuenow="0" class="ant-slider-handle" style="left: 0%; transform: translateX(-50%);"></div>
     <div class="ant-slider-mark"></div>
-  </div> <span role="img" aria-label="smile" class="anticon anticon-smile"><svg viewBox="64 64 896 896" focusable="false" data-icon="smile" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"></path></svg></span></div>
+  </div> <span role="img" aria-label="smile" class="anticon anticon-smile"><svg viewBox="64 64 896 896" focusable="false" data-icon="smile" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"></path></svg></span>
+</div>
 `;
 
 exports[`renders ./antdv-demo/docs/slider/demo/input-number.md correctly 1`] = `
diff --git a/components/tag/__tests__/__snapshots__/demo.test.js.snap b/components/tag/__tests__/__snapshots__/demo.test.js.snap
index d7ebf420b..bcfb91d3e 100644
--- a/components/tag/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tag/__tests__/__snapshots__/demo.test.js.snap
@@ -1,6 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders ./antdv-demo/docs/tag/demo/basic.md correctly 1`] = `<div><span class="ant-tag">Tag 1</span> <span class="ant-tag"><a href="https://github.com/vueComponent/ant-design">Link</a></span> <span class="ant-tag">Tag 2<span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span> <span class="ant-tag">Prevent Default<span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></div>`;
+exports[`renders ./antdv-demo/docs/tag/demo/basic.md correctly 1`] = `
+<div><span class="ant-tag">Tag 1</span> <span class="ant-tag"><a href="https://github.com/vueComponent/ant-design">Link</a></span> <span class="ant-tag">
+    Tag 2
+  <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span> <span class="ant-tag">
+    Prevent Default
+  <span role="img" aria-label="close" tabindex="-1" class="anticon anticon-close"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></div>
+`;
 
 exports[`renders ./antdv-demo/docs/tag/demo/checkable.md correctly 1`] = `
 <div>
diff --git a/components/transfer/__tests__/__snapshots__/demo.test.js.snap b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
index 9b1aef7e8..dd7ea0b9e 100644
--- a/components/transfer/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/transfer/__tests__/__snapshots__/demo.test.js.snap
@@ -2419,7 +2419,7 @@ exports[`renders ./antdv-demo/docs/transfer/demo/tree-transfer.md correctly 1`]
         <div class="ant-transfer-list-body-customize-wrapper">
           <ul role="tree" unselectable="on" class="ant-tree ant-tree-icon-hide ant-tree-block-node">
             <li role="treeitem" class="ant-tree-treenode-switcher-open"><span class="ant-tree-switcher ant-tree-switcher-noop"></span><span class="ant-tree-checkbox"><span class="ant-tree-checkbox-inner"></span></span><span title="0-0" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"><span class="ant-tree-title">0-0</span></span></li>
-            <li role="treeitem" class="ant-tree-treenode-switcher-open"><span class="ant-tree-switcher ant-tree-switcher_open"><i aria-label="icon: caret-down" class="anticon anticon-caret-down ant-tree-switcher-icon"><svg viewBox="0 0 1024 1024" data-icon="caret-down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"></path></svg></i></span><span class="ant-tree-checkbox"><span class="ant-tree-checkbox-inner"></span></span><span title="0-1" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"><span class="ant-tree-title">0-1</span></span>
+            <li role="treeitem" class="ant-tree-treenode-switcher-open"><span class="ant-tree-switcher ant-tree-switcher_open"><span role="img" aria-label="caret-down" class="anticon anticon-caret-down ant-tree-switcher-icon"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="caret-down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"></path></svg></span></span><span class="ant-tree-checkbox"><span class="ant-tree-checkbox-inner"></span></span><span title="0-1" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"><span class="ant-tree-title">0-1</span></span>
               <ul data-expanded="true" role="group" class="ant-tree-child-tree ant-tree-child-tree-open">
                 <li role="treeitem" class="ant-tree-treenode-switcher-open"><span class="ant-tree-switcher ant-tree-switcher-noop"></span><span class="ant-tree-checkbox"><span class="ant-tree-checkbox-inner"></span></span><span title="0-1-0" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"><span class="ant-tree-title">0-1-0</span></span></li>
                 <li role="treeitem" class="ant-tree-treenode-switcher-open"><span class="ant-tree-switcher ant-tree-switcher-noop"></span><span class="ant-tree-checkbox"><span class="ant-tree-checkbox-inner"></span></span><span title="0-1-1" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"><span class="ant-tree-title">0-1-1</span></span></li>
@@ -2430,11 +2430,7 @@ exports[`renders ./antdv-demo/docs/transfer/demo/tree-transfer.md correctly 1`]
         </div>
       </div>
     </div>
-    <div class="ant-transfer-operation"><button disabled="disabled" type="button" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"><i aria-label="icon: right" class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-            <path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path>
-          </svg></i></button><button disabled="disabled" type="button" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"><i aria-label="icon: left" class="anticon anticon-left"><svg viewBox="64 64 896 896" data-icon="left" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
-            <path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 0 0 0 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path>
-          </svg></i></button></div>
+    <div class="ant-transfer-operation"><button disabled="disabled" type="button" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"><span role="img" aria-label="right" class="anticon anticon-right"><svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path></svg></span></button><button disabled="disabled" type="button" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only"><span role="img" aria-label="left" class="anticon anticon-left"><svg viewBox="64 64 896 896" focusable="false" data-icon="left" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path></svg></span></button></div>
     <div class="ant-transfer-list">
       <div class="ant-transfer-list-header"><span class="ant-transfer-list-header-selected"><span>0 item</span><span class="ant-transfer-list-header-title"></span></span></div>
       <div class="ant-transfer-list-body">
diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap
index 15a0042e4..2c313f1cd 100644
--- a/components/tree/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap
@@ -161,7 +161,7 @@ exports[`renders ./antdv-demo/docs/tree/demo/replaceFields.md correctly 1`] = `
 `;
 
 exports[`renders ./antdv-demo/docs/tree/demo/search.md correctly 1`] = `
-<div><span class="ant-input-affix-wrapper ant-input-search" style="margin-bottom: 8px;"><input placeholder="Search" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span>
+<div><span class="ant-input-search ant-input-affix-wrapper" style="margin-bottom: 8px;"><input placeholder="Search" type="text" class="ant-input"><span class="ant-input-suffix"><span role="img" aria-label="search" tabindex="-1" class="anticon anticon-search ant-input-search-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="search" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"></path></svg></span></span></span>
   <ul role="tree" unselectable="on" class="ant-tree ant-tree-icon-hide">
     <li role="treeitem" class="ant-tree-treenode-switcher-close"><span class="ant-tree-switcher ant-tree-switcher_close"><span role="img" aria-label="caret-down" class="anticon anticon-caret-down ant-tree-switcher-icon"><svg viewBox="0 0 1024 1024" focusable="false" data-icon="caret-down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M840.4 300H183.6c-19.7 0-30.7 20.8-18.5 35l328.4 380.8c9.4 10.9 27.5 10.9 37 0L858.9 335c12.2-14.2 1.2-35-18.5-35z"></path></svg></span></span><span title="" class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-close"><span class="ant-tree-title"><span>