working state after merge