Mended some Git collisions