got rid of a pry, return base:64 string
another conflic resolve...imadumass