edited contact panel
fix merge con