Merge trunk