* fix: #11213, #11215 * Use default colour * Fix typo in german translation * fix_the_conflict --------- Co-authored-by: Siddharth Movaliya <siddraj1992@gmail.com> Co-authored-by: Sean Brydon <sean@cal.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: unknown <adhabal2002@gmail.com>