Enable pulling from other branches
Merge branch 'origin/master'
Merge branch 'origin/dev'