Removed mac proconflict file