merge conflict resolving errors