[IMP] website_sale : Resolve Conflicts.