Allow merge commits
Update vimrc and colors