perbaikin beberapa link
resolve conflict
resolve conflict