commit before pull
new diff architecture - in progress