trying to fix buffer error on server
fixed conflict