Removed conflicts from config