bug fixes in SI
resolve conflict