delete conflicts
Merge branch 'master' of https://github.com/puruckertom/esa_python