Adding notes and changing the tag field
Fixed conflict