Fixed some bugs in Regression2.py
Fixed the merge conflict