Sometimes git merging borrows strongly from “The fly”