Attempting an online merge in my own repo