bad entry on Mac
conlfict resolved