update authors list
new version
Fix conflicts
Merge conflicts balbls