merge chunbin for proj2