merge author‘s change