Adding more stuff to Story 1 locally
Resolved merge conflict by using local changes