Thanks! Yeah, I considered going into merges and conflicts but that could be a whole other article by itself, so I made a brief mention and left it for people to Google instead :)
