No, really, really bad at git merging.