added call to ActiveModel::Model in BaseForm
merged files