Re: Various conflicts in updates