Mergiraf: a syntax-aware merge driver for Git