Ctrl-v
Merge
Conflicts:
	.vimrc
	qBittorrent/qBittorrent.conf