add contacts management
fix conflict