merge with goa-sf