resolving merge conflicts and aws pom spring dependency version conflicts

Merge request reports

Loading