bug fix v1.1 production
merged confilct
aded notes span