Fixing merge conflicts, adding admin