Committing changes before pulling.
Merging??