fixed merge conflicts in admin theme

@AmrARaouf  @adamggg  @m0hamed