fix a bad merge

Change-Id: I1921d30ff6706d9f1c020bd7e6216c31bebfe9a0
Damaged message queue offers resend and delete actions

Change-Id: Ica8567f7f368d55e0ae4c57822b6048caf7e561e