merge
deleted schema
temp fix active_model