Fix merge conflicts and adding new features
Fix megre conflicts
Removing vendor directory
Fix merge conflicts and add new features