Fix module for merging