Merge module stuff