Update version_control.py
fixed conflicts