Infragravity waves and bore merging