Add to quicknotes
Merged confclit