modified noteparser
added main
Fixed conflict