Resolved silly merge conflict
Merging of adjacent notes.