Conflicts Resolve

Conflicts resolved