update newfilecreatedlocally.txt introduce merge conflict from jci-teska local