Adding swap files to the ignore list
Adding 'push' and 'pull' commands
Merged conflicts