snapmerge: fix for false alarms