fix merge conflict of assignment

[peabody124]

This fix avoids a condition where people are multiple assigned in a frame. After that at times when they are popped from the frames in the below merge code, there are still some frames with that ID which triggers a later key errors when trying to look them up in the frame dictionary.

[peabody124]

p.s. wonderful library!