merge2- linux
merge conflicts resoved--linux