fixed the server from running three times over, now only writing to fs
resolve merge conflicts