merge with overlay plus overlay fix