Fix author
Fix conflicts