deorphan the word activity
merging changes