lol wtf is merging (or, how i learned to stop worrying and love git)