Derps after merge