modified another file
resolved conflict in .js file