stubbed out Way of the Duck outline
fixed conflict