Adding in .h file
Merging