add what the fuck to newfile
conflict fixed