fixed live conflict