Fixed dirty chord merge, chord tests now pass