Fix some merge unmanaged conflict