type changes
Conflict resoveled