updated diff and pull
updated diff and pull