fixing broken markup due to merge