[Maria-discuss] Branch 10.4 conflict

Hello! My local branch of 10.4 was at commit https://github.com/MariaDB/server/commit/9335e2a2b1d555d2ad83ae6f44acb8467c4... and pulling from upstream causes now conflicts. Did somebody (Jan?) overwrite git history recently for mariadb-server or what might be going on? - Otto