Resolving conflict on overview.html