working for linux machines
fixed conflict