experimenting with merging branches, git pull, and suprising girlfriend