Resolved the conflicts
Merged with main
Added feature files and updated gemfile for Cucumber and Capybara