Implemented all user stories
Conflict resolved