back to a normal state after merge