add edit fix
for patchesStrategicMerge to patches
#4733
Merged
edit fix
for patchesStrategicMerge to patches
#4733