Some primitives
Merged conflicts
Merging conflicts again