jna fix
conflict