add author info
merge