base commit in new_branch02
new commit after reslove confilict