Fixes for bad merge...

Removed Bad Merge HEAD <<<<< and ORIGIN <<<<