commit
merge
modified style