fix commit from first team
merge from first team first merge
added notes