snapmerge: 2 fixes