Conflicts: app/views/common/index.html.erb public/react/build/asset-manifest.json public/react/build/index.html public/react/build/service-worker.js public/react/build/static/js/12.db6c3c0e.chunk.js public/react/build/static/js/12.db6c3c0e.chunk.js.map public/react/build/static/js/17.45b7dec5.chunk.js public/react/build/static/js/17.45b7dec5.chunk.js.map public/react/build/static/js/main.32605315.js.map public/react/build/static/js/main.a9947884.js.map public/react/build/static/js/main.ea3ca4b2.js public/react/build/static/js/main.ea3ca4b2.js.map