Fix conflicts log in widgets/TbButton.php