Started work on merchant logics, few fixes

fixed bug where key could be picked up from different room