Support multiple authors
Fix merge