fix merge
update contact
update
update
update date and traffic icon