Add test.js to stage a merge conflict