fixed conflict
Conflict Resolution
: