some additional notes
merge conflict