update merging antara jon sama dedy