patches: fix overlay patch, remove already merged patch