before pull
server removed
fixed merge