fix conflict
added admin & instructor page