add git commit
merge both