POM FIXES

- remove all conflicts
- fix a common s3 uploader error case