Added flush-lines and keep-lines shortcuts
Merge conflict resolution