merged and fixed errors in activeadmin