Re: Conflicts in latest update