Resolving conflict on live.html
Resolving conflict on live.html