Git Merge Conflict

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 6h4a2 2 0 0 1 2 2v7M6 12v9M9 3 3 9m6 0L3 3"/><circle cx="18" cy="18" r="3"/></svg>