Changes to index that I need to commit to merge.
Updated git ignore.