A great feature for test.js
Add slides for merge conflict
Remove test.js