manual merge from hg (bitbucket)