Fix rebase error. Update author.