Resolving extension conflicts for ERP
Merge branch 'ERP'