master branch: bare bones for anyone to start with
fixup! b5f8d1f master branch: bare bones for anyone to start with

diff --git a/README.md b/README.md
index 6cff800..261888c 100644
--- a/README.md
+++ b/README.md
@@ -27,45 +27,54 @@ Configuration

 ## Prerequisites

 * [Vim](http://www.vim.org/) 7 or newer

 * [Git](http://git-scm.com/) 1.5 or newer

 * [POSIX shell](http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html)

+<<<<<<< HEAD
   Special note to Microsoft Windows users: simply

   * replace `~/.vim` with `%USERPROFILE%\vimfiles`
   * replace `~/.vimrc` with `%USERPROFILE%\_vimrc`

   in all commands listed throughout this document.

+=======
+>>>>>>> master branch: bare bones for anyone to start with
 [Unbundle]: https://github.com/sunaku/vim-unbundle

 ## Installing

 Backup your configuration:

     mv ~/.vim ~/.vim.bak
     mv ~/.vimrc ~/.vimrc.bak

 Install this configuration:

     git clone git://github.com/sunaku/.vim.git ~/.vim
     ln -s ~/.vim/config.vim ~/.vimrc

 Select a Git branch to use:

     cd ~/.vim
+<<<<<<< HEAD
     git checkout master                   # bare bones
     git checkout -b config origin/config  # bare bones + my config
     git checkout -b bundle origin/bundle  # bare bones + my config + my bundles
+=======
+    git checkout master  # bare bones
+    git checkout config  # bare bones + my config
+    git checkout bundle  # bare bones + my config + my bundles
+>>>>>>> master branch: bare bones for anyone to start with

 Install bundles from `*.get` files:

     cd ~/.vim
     ./obtain

 ## Bundling

 Add bundle from *URL*:
fixup! 5a2dfae master branch: bare bones for anyone to start with

diff --git a/README.md b/README.md
index 6cff800..03e86d0 100644
--- a/README.md
+++ b/README.md
@@ -51,21 +51,27 @@ Backup your configuration:

 Install this configuration:

     git clone git://github.com/sunaku/.vim.git ~/.vim
     ln -s ~/.vim/config.vim ~/.vimrc

 Select a Git branch to use:

     cd ~/.vim
+<<<<<<< HEAD
     git checkout master                   # bare bones
     git checkout -b config origin/config  # bare bones + my config
     git checkout -b bundle origin/bundle  # bare bones + my config + my bundles
+=======
+    git checkout master  # bare bones
+    git checkout config  # bare bones + my config
+    git checkout bundle  # bare bones + my config + my bundles
+>>>>>>> master branch: bare bones for anyone to start with

 Install bundles from `*.get` files:

     cd ~/.vim
     ./obtain

 ## Bundling

 Add bundle from *URL*:
	new file:   bundle/DeleteTrailingWhitespace.get
	new file:   bundle/ShowTrailingWhitespace.get
	new file:   bundle/Zenburn.get
	new file:   bundle/base16-vim.get
	new file:   bundle/ctrlp.get
	new file:   bundle/gundo.get
	new file:   bundle/lastpos.get
	new file:   bundle/molokai.get
	new file:   bundle/mustang-vim.get
	new file:   bundle/nerdtree.get
	new file:   bundle/numbers.get
	new file:   bundle/pyte.get
	new file:   bundle/supertab.get
	new file:   bundle/syntastic.get
	new file:   bundle/tlib_vim.get
	new file:   bundle/vim-addon-mw-utils.get
	new file:   bundle/vim-airline.get
	new file:   bundle/vim-airlineish.get
	new file:   bundle/vim-colors-solarized.get
	new file:   bundle/vim-easymotion.get
	new file:   bundle/vim-indent-guides.get
	new file:   bundle/vim-multiple-cursors.get
	new file:   bundle/vim-sensible.get
	new file:   bundle/vim-snipmate.get
	new file:   bundle/vim-snippets.get
	new file:   bundle/vim-surround.get
	new file:   bundle/vim-unimpaired.get
	new file:   config/a_vimrc.vim
	new file:   config/b_globvar.vim
	new file:   config/c_mapping.vim
	new file:   config/d_color.vim
	new file:   config/function.vim
	new file:   ftbundle/csv/csv.get
	new file:   ftbundle/vim-ruby/vim-ruby.get
	new file:   updateAll
	new file:   vimrc
	modified:   updateAll
	modified:   README.md
fixup! 79d9d69 	modified:   README.md

diff --git a/README.md b/README.md
index 4ae4de2..ce000bf 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,14 @@
+<<<<<<< HEAD
 # Using sunaku.vim Vim script management system

+=======
+>>>>>>> 	modified:   README.md
 # sunaku.vim bootstrap (master branch)

 Unlike most Vim configurations you find on the Internet, this one is modular:
 *not* a single giant `vimrc` file!  May it help you journey the lands of Vim.

 ## Overview

 Branches

@@ -121,10 +124,9 @@ Do all this periodically via crontab(1):
 Lock a *BUNDLE* to a certain Git *COMMIT* to prevent it from being upgraded:

     cd BUNDLE
     git checkout COMMIT

 Unlock a locked *BUNDLE* so that it can be upgraded again:

     cd BUNDLE
     git checkout master
-
	modified:   config/a_vimrc.vim
	new file:   config/autocomands
	modified:   config/c_mapping.vim
	modified:   config/a_vimrc.vim
Merge branch 'master' of https://github.com/bozidarp/vimfiles

Conflicts:
	README.md
	config/a_vimrc.vim

	modified:   README.md
	modified:   config/a_vimrc.vim