This prevents CI from failing after the merge.
This avoids some merge conflicts to allow git blame to detect renames properly.