Fixed conflict weirdness