merge2 -linux
resolve fetch and merge