Modified style in staging
Modified style in develop
comfilct resolution