step 1
Database architecture
test.js conflict resolve