solve conflicts according to https://github.com/kristijanhusak/vim-multiple-cursors#info