merge author's new updates