amend author
resolve trivial merge conflict