Admin changes are done
Merge conflict is resolved