adding cargo model
resolving conflicts