Solving conflicts

Solving conflicts in AddInsuranceFragment and SummaryIncomeFragment