So, we're armed and ready for the next conflict.
Ok, now we are.
Merge branch 'v2' into gitInConflict