transfer files from bitbucket
change titles
merge conflicts