Merge with sapo