Reconcile conflicts with `base/extends/_button`
Remove `shared/_forms` partial