Keep on merging

Today I managed to survive to the biggest git merge of my career: 460 files in total, and 134 files with multiple conflicts.

Please save your life: short-lived feature branch, always!