merge with bitbucket