With Emily 3
Merge remote-tracking branch 'origin/master'
Working with Emily 4