Ashkan: commit before pull