kill conflicts

all in order