Learning about git branch merges & stuff, 'cause I'm a git :D