@chardan, this is not compiling. I see the aftermath of a rebase here. There is no merge history to figure out what else broke with the rebase.  Please correct and re-check if you have lost anything else if you can.  Please be careful not to check in broken code man. Compile and run the tests after a merge/rebase.