adding new file to stage and deleting on disk and commiting to see if
works
Merge branch 'master', remote-tracking branch 'origin'