merge 2 linux
resolved fetch and merge