Mergiraf: Syntax-Aware Merging for Git | Not Hacker News!