Resolve merge conflicts
WIP Bug w encoding images
Remove whitespace
Fix base64 test