config not tracked
conflict fixed