go ahead and merge to trunk