unshuffled some lines from merged updates