Resolve merge issue
Replace correct HTML