obexftp confilicts fixed