Test commit from my Linux VM
Resolve conflict