Correct feature/formal lists.
Fix conflics.