comment server .c .h
merged conflict