commit 1
merge conflict in package.json resolved