rubah
resolve conflict
resolve conflict