fixed : merge conflict #20

[Bivas-Biswas]

Pull Request Template

Description

fetched the updated code and update header file

Fixes # (#20 )

Type of change

Please delete options that are not relevant.

• [ x] Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

• [x ] My contribution follows the style guidelines of this project
• [x ] I have performed a self-review of my own contribution
• [x ] I have made corresponding changes to the documentation
• [x ] My changes generate no new warnings
• [x] I have checked my code and corrected any misspellings

[ruchika-01p]

The conflicts are still not resolved please again look over it

[nehakalbande]

@Bivas-Biswas there are some changes done in the Header file. Please look over it and then update it

[Bivas-Biswas]

@Bivas-Biswas there are some changes done in the Header file. Please look over it and then update it

done