merge 2 linux
resolved fecth and merge