by pp:.crproject .project, confict with these two files, commit them for
trying.
Merge branch 'master' of https://github.com/bcl104/ns3.git