[IMP] website_sale : Resolve conflicts.