#0003 fixed conflicts with shape creation