fix: conflict merge.

client/src/containers/Settings/withSettings.js

@@ -5,9 +5,10 @@ export default (mapState) => {
     const mapped = {
       organizationSettings: state.settings.data.organization,
       manualJournalsSettings: state.settings.data.manual_journals,
+      billsettings: state.settings.data.bills,
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };
 
   return connect(mapStateToProps);
-}
+};