pydictadded
conflict fixed
git prompt changed