added vim - select by mark
added git merge conflict by applying patch