Fix rails admin category bug
Fix merge conflicts