Fix conflict version