fixes broken html conflicts