adding new features to .vim setup
text files update
python setup change
python merge fix
conflict resolution