fixed collisions from merging in server methods