Resolved other conflict