Resolve Message.php conflic