my first commit
merge code