# Conflicts: # front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java # front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseMapper.java # front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java