Resovled merge conflict in main module