use mvim for merging