is this in client or on merge or... maybe i should re read thread