home settings update
conflict resolve