Cleaned up client/server stuff
Fixed conflict