Resolved more html conflicts