fixed small errors in server
fixed merge conflicts
filekey