readding module 5 after conflict fiasco