Auto-resolve everythng except conflicts

Printable View