Resolve conflicts with aws sdk dependencies