"adding the model and database code"
trying to fix conflicts
conflicts are a bitch