Fixed Merge conflict
Commented out global/loacl add for add authcodes