Add package.json and .gitignore
Fix conflict.