Parse note length
Fix merge conflict