Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r 07f9606793ac https://bitbucket.org/zandronum/zandronum-sandbox
hg merge 07f9606793ac
hg commit -m 'Merged in zandronum/zandronum-sandbox (pull request #207)'