Removed conflicts between features modules