new background
conflict fixed