panel change
conflict resolve