Working contact list, with tatiana
Solving merge conflicts