Git and Vim setup for efficient conflict resolution