Fix merge issue with note_controller