Story 03: change and push back
Story 05: merge conflict solved