2nd commit-linux
conflict solving