java7 -> java6
merge