Resolve all the conflicts...