udpate daily work record and git command set
finish manual merge