 merge trunk