small 'patch' for custom merge