merging Bitbucket code