replace jnlin with cloud.sung
fixed the merge conflict