tinggal debug
resolve conflict