Split into auto/interactive merge
Interactive merge