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 pull -r default https://bitbucket.org/bwinton/pixelcity-mac
I just noticed that I had some fixes to PixelCityMac lying around. Maybe you want them, maybe not, but if you do, they're yours! :)