2. Tails
3. wiki/src/index.*.po
4. Changes

Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/upgrade/v1/Tails/3.13.2/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.2/amd64/alpha/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/alpha/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/3.12.2/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.12.2/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.1.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.1.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.sig
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.sig
Removing wiki/src/lib/survey.png
Auto-merging wiki/src/install/inc/steps/download.inline.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.es.po
Removing wiki/src/donate/flattr-badge-large.png
Removing wiki/src/donate/expenses.svg
Removing wiki/src/donate/expenses.fr.png
Auto-merging wiki/src/doc/anonymous_internet/electrum.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.it.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po
Removing wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
CONFLICT (modify/delete): submodules/pythonlib deleted in HEAD and modified in origin/master. Version origin/master of submodules/pythonlib left in tree.
Removing po/hu.po
Removing po/fa.po
Removing po/ar.po
Removing config/chroot_local-hooks/11-check-thunderbird-addons
Automatic merge failed; fix conflicts and then commit the result. (1)

Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/upgrade/v1/Tails/3.13.2/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.2/amd64/alpha/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/alpha/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/3.12.2/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.12.2/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.1.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.1.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.sig
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.sig
Auto-merging wiki/src/install/inc/steps/download.inline.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.es.po
Removing wiki/src/donate/flattr-badge-large.png
Removing wiki/src/donate/expenses.svg
Removing wiki/src/donate/expenses.fr.png
Auto-merging wiki/src/doc/anonymous_internet/electrum.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.it.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po
Removing wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
CONFLICT (modify/delete): submodules/pythonlib deleted in HEAD and modified in origin/master. Version origin/master of submodules/pythonlib left in tree.
Removing po/hu.po
Removing po/fa.po
Removing po/ar.po
Removing config/chroot_local-hooks/11-check-thunderbird-addons
Automatic merge failed; fix conflicts and then commit the result. (1)

Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/alpha/upgrades.yml.pgp
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/stable/upgrades.yml
Auto-merging wiki/src/upgrade/v1/Tails/3.13.1/amd64/alpha/upgrades.yml
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.packages
Auto-merging wiki/src/torrents/files/tails-amd64-3.13.build-manifest
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.iso.sig
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.torrent
Removing wiki/src/torrents/files/tails-amd64-3.12.1.img.sig
Auto-merging wiki/src/install/inc/steps/download.inline.es.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.es.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.it.po
Auto-merging wiki/src/doc/anonymous_internet/electrum.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.de.po
Removing wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
CONFLICT (modify/delete): submodules/pythonlib deleted in HEAD and modified in origin/master. Version origin/master of submodules/pythonlib left in tree.
Removing po/hu.po
Removing po/fa.po
Removing po/ar.po
Removing config/chroot_local-hooks/11-check-thunderbird-addons
Automatic merge failed; fix conflicts and then commit the result. (1)