Some stuffs from admin & articles view/repo
resolv conflict