Fixed conflict
Resolved other conflict
work...pls