Can't swap places with merchant

[Grey]

I understand the reasons why, but can it at least be changed after the assassin lord is dead? It leads to frustrating situations where I have to walk 20 squares with him following because he was standing on the stairs in a narrow tunnel.