nodes conflict fixed