force instead of merging, did a hard reset back to completed User Story #1 and did a force.