reserve merge conflicts from latest sf.net pull