test add newFile
master change
dev change
conflict fixed