initial commit.
update conflicts.
add main.js