intelligence pizza
merge conflict