Add fix
Completed user story
Merge the conflicts