remote commit conflict garbage