Added delete row (exercise), Added delete entry, Added add note, Added
add to favorites
merge conflict
merged conflicts
fix merge issues
merge
fix merge errors
merge