solved conflict in CMakelists.txt

CMakeLists.txt

INSTALL

maca_export/CMakeLists.txt

maca_export/example/example.java

maca_export/example/example.py

maca_export/src/maca_export.i

maca_export/src/maca_lemmatizer_export.cc

maca_export/src/maca_lemmatizer_export.h

maca_export/src/maca_trans_parser_export.cc

maca_export/src/maca_trans_parser_export.h

maca_export/src/maca_trans_tagger_export.cc

maca_export/src/maca_trans_tagger_export.h

maca_trans_parser/src/simple_decoder_tagger.c

maca_trans_parser/src/simple_decoder_tagger.h