Conflicted Files committed post conflict resolution

Conflicts resolved from Modules.less and Modules.css