added swap pane function in vi
resolved conflicts