fixed merge errors, removed randomizer from makefile until it compiles