fix conflicts in Javascript sources