Manual merge in Adam Gorbahns name.