current features with lots of conflicts.