I also had Tingalf arrested before going to the merchant guild, but after Trevor asked me to look into a suspected black market dealer, I had the option to say he had already been arrested, and thus completed the quest.
Larian/Silver armour-screenie-spoiler 
