changes
merge
master
newbranch
fixed bugs