fixed module conflicts