Run time error: Merge error: file already exists, pass option { overwrite: true }

[yringler]

I set up funnel in ember-cli-build.js to copy a translations file into dist.
It worked, but after I left to another git branch and came back, the builds fail with the following error;

Merge error: file translations/en-us.json exists in C:\Users\john.doe\AppData\Local\Temp\broccoli-19700SykRagiBUk5I\out-272-broccoli_merge_trees_application_dist and C:\Users\john.doe\AppData\Local\Temp\broccoli-19700SykRagiBUk5I\out-274-funnel
Pass option { overwrite: true } to mergeTrees in order to have the latter file win.

Here is the relevant code:

	const extraAssets = new Funnel('translations', {
		destDir: '/translations'
	});

	return app.toTree(extraAssets);

[yringler]

As per docs, I put files in /public folder, and ember copies them over itself.