stuff to match sf
conflict merge