What the wacky merge did I just do?