Fixed merge conflict in main module