conflict solved on OSX