updated queue server
fixed some merging errors