fix of previous fix, forgot to remove merge, added route to admin page,