## 2018-04-26 #MergeProblem 

Yesterday, we had to roll back a commit, after an automatic merge went wrong and reverted a whole week of work.