Re: conflicts while updating