bug fix, v1.1 for production
merge
favio1
favio2
conflict created
conflict created fixed
added notes