Commits 2f8e4347b1f9c2bf093ac48a636576c22359c1ff and 6a32d58876995f18b35ffd89b8875a99417c29cf had a conflict that was undetected by source control.