second commit, no merging error expected