better resolved merge conflicts
added caching method (for big projects), off by default + removed unused functions