##Resolve Conflict Commit.
##Resolve Conflict Commit.
New files added - []
Files modified - [Main.html]
Refactored files - []
Fixed bugs - []
Removed files - []