waitpage working, decline button half working
merge conflict fix