oglach wrote:any1?
If you ask me based on my past experience with the Auto update, sometimes it seems to merge your modded code into the new file and everything comes out perfect but other times it had overwritten my mods and I just had to reinstall those edits to those affected files. If you are only having conflicts with two files then I wouldn't wory about it. The worst that can hapen is that you may have to re-do the edits for your mods to those two files.