Fixed note conflict