[BUGFIX] Remove conflicts entry in fluid_styled_content