Resolved a trouble after auto-resolving conflicts.