merge trunk into import