combine server git with main one