Remove some conflict resolution artifacts
And leave only the working link to asset-tracking.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
And leave only the working link to asset-tracking.