error notification
merge conflict in file.js