Final merge conflict commit for error messages