Fix other conflict