completed new client gui, fixed conflict table bugs, implement new client