resetting author
merge it already