Made main.html prettier
Resolved a conflict