second commit-merge linux
conflict 1 solved