Yes, see this example: https://mergiraf.org/conflicts.html#line-based-merges