combine client repo into main