my first commit
a second commit
committing with remote and merging