added submodule for sticko
resolved merge conflict