Ajay Tripathy c2deffb175 fix conflict 4 gadi atpakaļ
..
aws.go c2deffb175 fix conflict 4 gadi atpakaļ