change home layout
conflict change