Upgrade to new residemenu.  Nonfunctioning at this point
fix conflict