last state before merge
tdd lecture added