Saving the latest.
Removing swap files from repo.
Update gitignore.
Resolved merge conflicts.