fix and add remove conflict beams