Refactor chords generation
resolve conflict