Modify user pull function so that it doesn't overwrite local changes by default.
Modify user pull function so that it doesn't overwrite local changes by default.