Fix erm 'merge conflicts' #blamepoppy
Thumbs.db! Y u show ^!