Git: The Tool Loved and (sometimes) Feared - Git Merge 2017