Admin controller was added
Conflicts reserved