my agent rebased and forcepushed with conflicts...