Fifxing activity log merge issues