mages added
Resolved conflict