Removed static-file-map.json
Fixed merge conflict