models created, db connection
conflict resolved