Remove left over conflict trash.