Change TRAMP mode to ssh
Add ffmerge, set merge strategy to simple