fixed title/notes crash
fixing unmerged files