[REFACTOR] Resolve conflict with staging

src/components/CardMesinRusak/CardMesinRusak.js

src/components/CardMesinRusak/CardMesinRusak.test.js

src/components/CardMesinRusak/DeleteLaporan.test.js

src/components/CardsToken/CardsToken.js

src/components/CardsToken/CardsToken.test.js

src/components/Pagination/Pagination.js

src/components/PopUpFeedback/PopUpFeedback.css

src/components/PopUpFeedback/PopUpFeedback.js

src/components/PopUpFeedback/PopUpFeedback.test.js

src/page/DetailInvestasi/DetailInvestasi.js

src/page/LaporanDetail/LaporanDetail.css

src/page/LaporanDetail/LaporanDetail.js

src/page/UpdatePengadaan/UpdatePengadaan.js

src/page/UpdatePengadaan/UpdatePengadaan.test.js