added pp_test3
merge .pro.user