Adding new file for Story 1
Update file-3
Adding more stuff to Story 1 locally
Resolved merge conflict by using local changes
Squashing the three commits to one
Adding more stuff, including forgotten file