Revert "fixing merge issues"

This reverts commit 30ab6bc62291677031d560b7a93908d2dc74687b.
Revert "merge issues fixes"

This reverts commit 7187db50cc87d2c5247c2e7691ca4a4a66cae44e.
Revert "Revert "fixing merge issues""

This reverts commit d03f2cfadf59e42420e559ce03be147a97a6662f.
Revert "Revert "merge issues fixes""

This reverts commit ab74224438c14a352c0dd2b521c7eec323cfc7e8.
Revert "Revert "Revert "fixing merge issues"""

This reverts commit 30828a7e17862854930209b82d6a0cb2c20a85f8.
Revert "Revert "Revert "merge issues fixes"""

This reverts commit a53611fad47826872661d527d3e90162803b9cb4.
Revert "(businessHours) fix error when weekend is not shown"

This reverts commit 2752d9349285dbb4033dee7b1aa840a35d156dfb.