first commit
first commit with merge