Fixed improper merge conflict resolutions.
Should be good to go with current master branch!