Resovled merge conflicts and re-added misssing .h file.