Time to try another approach for the shapes, otherwise, the selection would be really hard!
Fixed the merge