Added modules
Merge conflict resolution