One line for the process related group title
removed an unintentionally added 'p'
Merge remote-tracking branch 'origin/staging' into staging
Remove trailing whitespace - all files
Merge branch 'staging' into topic_bug
Merge branch 'topic_bug' into staging
resolving conflict involving whitespace removal
Merge branch 'whitespace' into staging