idk what i actually did
merged with remote
pull commit
merge with remote
fixed analytics  bug