changed to linux
conflict resolution