update changelog

Author: westnordost

CHANGELOG.md

@@ -13,7 +13,7 @@
 - Redid UI for quest title speech bubble with smoother ℹ️ area (#6784)
 - Redid UI for forms creating a note, especially attaching images (#6804)
 - Power line attachment: Don't ask when several power lines go through one power pole or tower (#6547)
-- Other minor improvements (#6770, #6810, #6798…), thanks @mnalis
+- Other minor improvements (#6770, #6810, #6798, #6771…), thanks @mnalis
 
 ### General Improvements
 
@@ -31,7 +31,7 @@
 
 - Bike paths overlay: OK button didn't always show (#6644) (wasn't fixed in v62.1 after all)
 - Fix layout for "New OSM message" dialog (#6791)
-
+- Fix crash caused by automatic conflict resolution on upload under certain circumstances (#6825, #6779, #6419)
 
 ## v63.0
 

app/src/commonMain/composeResources/files/changelog.html

@@ -11,7 +11,7 @@ <h3>Quest improvements</h3>
 <li>Redid UI for quest title speech bubble with smoother ℹ️ area (<a href="https://github.com/streetcomplete/StreetComplete/issues/6784">#6784</a>)</li>
 <li>Redid UI for forms creating a note, especially attaching images (<a href="https://github.com/streetcomplete/StreetComplete/issues/6804">#6804</a>)</li>
 <li>Power line attachment: Don't ask when several power lines go through one power pole or tower (<a href="https://github.com/streetcomplete/StreetComplete/issues/6547">#6547</a>)</li>
-<li>Other minor improvements (<a href="https://github.com/streetcomplete/StreetComplete/issues/6770">#6770</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6810">#6810</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6798">#6798</a>…), thanks <a href="https://github.com/mnalis">mnalis</a></li>
+<li>Other minor improvements (<a href="https://github.com/streetcomplete/StreetComplete/issues/6770">#6770</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6810">#6810</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6798">#6798</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6771">#6771</a>…), thanks <a href="https://github.com/mnalis">mnalis</a></li>
 </ul>
 <h3>General Improvements</h3>
 <ul>
@@ -29,6 +29,7 @@ <h3>Fixes</h3>
 <ul>
 <li>Bike paths overlay: OK button didn't always show (<a href="https://github.com/streetcomplete/StreetComplete/issues/6644">#6644</a>) (wasn't fixed in v62.1 after all)</li>
 <li>Fix layout for &quot;New OSM message&quot; dialog (<a href="https://github.com/streetcomplete/StreetComplete/issues/6791">#6791</a>)</li>
+<li>Fix crash caused by automatic conflict resolution on upload under certain circumstances (<a href="https://github.com/streetcomplete/StreetComplete/issues/6825">#6825</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6779">#6779</a>, <a href="https://github.com/streetcomplete/StreetComplete/issues/6419">#6419</a>)</li>
 </ul>
 <h2>v63.0</h2>
 <h3>General Improvements</h3>