Removed mac conflicts