ubah 2
merge
ubah4