Merge with bitbucket repo