newfilecreatedlocally.txt after merge from stash