vim plugin: resolve conflicts during three-way merges
