Allow overriding of different (non-container) types in merge tool. fix #2814