Added Check for no events on Profile
Fixed Merge Conflicts