admin timer working
fixed merge conflict
fixed merge conflict