more integration changes
resolve conflict