snapmerge: various fixes