fixed advisors
merge resolution