Hide buttons from non-admin
fix conflicts in clas show
before db merge
fix conflict db