resolved merge conflicts and added stanford-corenlp library