computer change newFile
pull and fixed conflict;merge newFile