merge updates from the author