Fixed note conflict test