Git Merge 2017 Recap