some merge
from java