added world gen
fixed merge confilicsts