conflict Resolved