add some sample projects
fix conflict