version bump
conflicts fixed
removed swap files and ignored them in gitignore
before deployment