resolve merge conflict

web/jest.config.mjs

@@ -86,6 +86,8 @@ export default {
 
 	// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
 	moduleNameMapper: {
+		'\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+			'identity-obj-proxy',
 		'^\\$lib(.*)$': '<rootDir>/src/lib$1',
 		'^\\@api(.*)$': '<rootDir>/src/api$1',
 		'^\\@test-data(.*)$': '<rootDir>/src/test-data$1'