commit before pull github
after merging with github
new style (spaces)