finished migrations and models
trying to push
trying to fix merge