add figaro
merge