Fixing alerts and the advisor confirmation page
fixing conflicts