server setupe complete
stupid merge error