C-s for split horizontally
Resolve merge conflict