Add Mg
change 'authtor' to 'author'
Fixed conflicts