add thumb location
fix conflict