Change 2 linux
Resolve conflict