merged files from bitbucket