apa aja
resolve conflict