edited test.js,adda_test.js
removed marge conflict