Stick to correct versions of active_admin
Conflict resolution.