index
merge conflict
fixed merge conflict #2
fixed merge conflicts...