edited income
resolve conflict