test of change to edit-ints - make parse error / merge conflict go away