merge trunk to branch