edited income
remove conflict