Fix merge conflict marks
Removing merge conflict marks from /handbook/marketing/
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Removing merge conflict marks from /handbook/marketing/