Linux : added merge 2
Linux : resolved conflict by fetch merge