Add contact info
fix merge conflict