setting xml adjust
conflict