fix missed conflict