The merged blocks are Churn Dash and a Boat. I set this in a horizontal layout so that the boats look safe!
The auto border is the Y block in the triangular style.