# Conflicts:
#	CHANGELOG.md
#	dist/kaltura-ovp-player.cjs.js
#	dist/kaltura-ovp-player.cjs.js.map
#	dist/kaltura-ovp-player.js
#	dist/kaltura-ovp-player.js.map
#	dist/kaltura-tv-player.cjs.js
#	dist/kaltura-tv-player.cjs.js.map
#	dist/kaltura-tv-player.js
#	dist/kaltura-tv-player.js.map
#	docs/advertisement-layout-management.md
#	docs/api.md
#	docs/request-response-manipulation.md
#	package.json
#	src/common/controllers/ads-controller.js
#	src/common/ui-wrapper.js
#	src/common/utils/setup-helpers.js
#	src/common/utils/thumbs.js
#	src/kontorol-player.js
#	src/ott/player-defaults.js
#	src/ovp/player-defaults.js
#	test/src/common/ads/ads-controller.spec.js
#	test/src/common/utils/setup-helpers.spec.js
#	test/src/common/utils/thumbs.spec.js
#	test/src/common/utils/ui-wrapper.spec.js
#	yarn.lock