fixes for merge issues from bitbucket to github