merge trunk