conflicts crux

.