updated contacts.php TG
resolved conflicts TG