Merge resolved.