Not a comment about the merge, but the project in general....and completely just a personal opinion...but git history is a much better author indication than an authors file