Added models and activeadmin
remove conflits