pull
merge
first models + db config