Git alias to unmerge file conflicts