Mergiraf: A syntax-aware merge driver for Git