merge trunk and fix merge conflicts