I hope the bots enjoy fixing these merge conflicts 😰