models: removed double sqlalchemy import
models: resolve merge conflicts