resolve linux/mac conflicts