working end to end
correct code on failing test
fix merge conflicts