Working on summary of exchanged products
Resolving conflicts