update to 3.4
update conflict after merge
ignore this commit, a wrong file in working branch
fix the manifest