create new workspace
RPC first version defined
Merge branch {zjw:2c87a3} and resolve conflicts