fix(Client): build as exe insted of lib
fix(merge):conflicts