overlay: fix leftover conflict