new function test3
fix merge