Merge2 Linux
Resolved fetch and merge