Conflicts: Makefile core/src/main/java/spark/compress/lzf/LZF.java core/src/main/java/spark/compress/lzf/LZFInputStream.java core/src/main/java/spark/compress/lzf/LZFOutputStream.java core/src/main/native/spark_compress_lzf_LZF.c run