Merge code from bitbucket