updating server repo for push
fixing merge