Mergiraf: Syntax-Aware Merging for Git