Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang