fixing merging
Activity Log and Admin Customer integration half