UI Remove the javascript .map sourcemap files and add *.js.map to .gitignore file. These are major source of git conflicts and are used just for development purposes.