Re: Conflicts not being resolved