Added text to newFile for conflict practice