resolve conflit mapping between syntastic and riv