[CHORES] resolve conflict fron staging

README.md

package.json

src/App.js

src/components/CardSaldo/CardSaldo.js

src/components/CardSaldo/CardSaldo.test.js

src/components/CardsHistory/CardsHistory.css

src/components/CardsHistory/CardsHistory.js

src/components/NavProfile/NavProfile.js

src/page/HomepageOperator/HomepageOperator.js

src/page/KeuanganInvestor/KeuanganInvestor.css

src/page/KeuanganInvestor/KeuanganInvestor.js

src/page/KeuanganInvestor/KeuanganInvestor.test.js

src/page/KeuanganMitra/KeuanganMitra.js

src/page/KeuanganMitra/KeuanganMitra.test.js