Not certain this will work but try "merge across" instead of "merge".

However, the best approach is to never utilize any 'merging' at all. It will always, at some point, get you in trouble. Truly.