chore: resolve merge conflict in CHANGELOG.md

Author: osiegmar

.github/workflows/compat-17.yml

@@ -5,6 +5,10 @@ on:
     paths-ignore:
       - '**/*.md'
       - 'docs/**'
+  pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - 'docs/**'
 
 jobs:
   build:

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
 
   deploy:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

CHANGELOG.md

@@ -5,7 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- JRELEASER_CHANGELOG_APPEND - Do not remove or modify this section -->
 ## [4.1.1](https://github.com/osiegmar/FastCSV/compare/v4.1.0...v4.1.1) (2026-03-08)
 
 

README.md

@@ -10,6 +10,7 @@
 <p align="center">
   <a href="https://javadoc.io/doc/de.siegmar/fastcsv"><img src="https://javadoc.io/badge2/de.siegmar/fastcsv/javadoc.svg" alt="javadoc"></a>
   <a href="https://central.sonatype.com/artifact/de.siegmar/fastcsv"><img src="https://img.shields.io/maven-central/v/de.siegmar/fastcsv" alt="Maven Central"></a>
+  <a href="https://github.com/akullpp/awesome-java"><img src="https://awesome.re/mentioned-badge.svg" alt="Mentioned in Awesome Java"></a>
 </p>
 
 <p align="center">