extension notification changes
conflict resolve
resolve conflicts