trying to rebase -i HEAD~2
Merge branch 'new-D2K-mod-logo' of https://github.com/x-a-n-a-x/OpenRA into new-D2K-mod-logo