changed all files to get conflicts